commit a9bcacd88f0bbe43b14b57ae92f71a4f5f54f365
author Michael Spang <spang@google.com> Fri Mar 26 15:05:49 2021 -0400
committer GitHub <noreply@github.com> Fri Mar 26 15:05:49 2021 -0400
tree ce6f672c9ba6eaee96ff5eb42544fac063a8d060
parent 1a94b9e72047fa155fe733962d108afb64b4e197

Remove non-standard BLE advertisement opcode "1" (#5626)

Opcode is always zero per spec, and the advertisement shall not made at
all once a device is commissioned.

Remove logic in ChipBLEDeviceIdentificationInfo to specify an opcode of
"1" once the device is commissioned.

src/ble/CHIPBleServiceData.h

diff --git a/src/ble/CHIPBleServiceData.h b/src/ble/CHIPBleServiceData.h
index 1293e14..2ad72b5 100644
--- a/src/ble/CHIPBleServiceData.h
+++ b/src/ble/CHIPBleServiceData.h
@@ -47,13 +47,7 @@
 {
     constexpr static uint16_t kDiscriminatorMask = 0xfff;
 
-    enum
-    {
-        kPairingStatus_Unpaired = 0,
-        kPairingStatus_Paired   = 1,
-    };
-
-    uint8_t PairingStatus;
+    uint8_t OpCode;
     uint8_t DeviceDiscriminator[2];
     uint8_t DeviceVendorId[2];
     uint8_t DeviceProductId[2];

src/include/platform/internal/GenericConfigurationManagerImpl.cpp

diff --git a/src/include/platform/internal/GenericConfigurationManagerImpl.cpp b/src/include/platform/internal/GenericConfigurationManagerImpl.cpp
index 9cde2a4..739cebf 100644
--- a/src/include/platform/internal/GenericConfigurationManagerImpl.cpp
+++ b/src/include/platform/internal/GenericConfigurationManagerImpl.cpp
@@ -829,20 +829,6 @@
     SuccessOrExit(err);
     deviceIdInfo.SetDeviceDiscriminator(discriminator);
 
-    // TODO: Update when CHIP service/fabric provision is implemented
-#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-    deviceIdInfo.PairingStatus = ThreadStackMgr().IsThreadAttached()
-        ? Ble::ChipBLEDeviceIdentificationInfo::kPairingStatus_Paired
-        : Ble::ChipBLEDeviceIdentificationInfo::kPairingStatus_Unpaired;
-#elif CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-    deviceIdInfo.PairingStatus = ConnectivityMgr().IsWiFiStationConnected()
-        ? Ble::ChipBLEDeviceIdentificationInfo::kPairingStatus_Paired
-        : Ble::ChipBLEDeviceIdentificationInfo::kPairingStatus_Unpaired;
-#else
-    deviceIdInfo.PairingStatus = Impl()->_IsPairedToAccount() ? Ble::ChipBLEDeviceIdentificationInfo::kPairingStatus_Paired
-                                                              : Ble::ChipBLEDeviceIdentificationInfo::kPairingStatus_Unpaired;
-#endif
-
 exit:
     return err;
 }