Add BLE shutdown, make linux free up scanning upon shutdown (#11437)

* Add BLE shutdown, make linux free up scanning upon shutdown

* Add shutdown method for ameba as well

* Revert change to copyright date in gn.py

src/include/platform/internal/BLEManager.h

@@ -54,6 +54,7 @@ class BLEManager
  using BLEAdvertisingMode = ConnectivityManager::BLEAdvertisingMode;
 
  CHIP_ERROR Init();
+ CHIP_ERROR Shutdown();
  CHIPoBLEServiceMode GetCHIPoBLEServiceMode();
  CHIP_ERROR SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool IsAdvertisingEnabled();
@@ -116,6 +117,12 @@ inline CHIP_ERROR BLEManager::Init()
  return static_cast<ImplClass *>(this)->_Init();
 }
 
+inline CHIP_ERROR BLEManager::Shutdown()
+{
+ ReturnErrorOnFailure(GetBleLayer()->Shutdown());
+ return static_cast<ImplClass *>(this)->_Shutdown();
+}
+
 inline BLEManager::CHIPoBLEServiceMode BLEManager::GetCHIPoBLEServiceMode()
 {
  return static_cast<ImplClass *>(this)->_GetCHIPoBLEServiceMode();

src/include/platform/internal/GenericPlatformManagerImpl.cpp

@@ -134,8 +134,8 @@ CHIP_ERROR GenericPlatformManagerImpl<ImplClass>::_Shutdown()
  err = InetLayer().Shutdown();
 
 #if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
- ChipLogError(DeviceLayer, "BLE layer shutdown");
- err = BLEMgr().GetBleLayer()->Shutdown();
+ ChipLogError(DeviceLayer, "BLE shutdown");
+ err = BLEMgr().Shutdown();
 #endif
 
  ChipLogError(DeviceLayer, "System Layer shutdown");

src/platform/Ameba/BLEManagerImpl.h

@@ -46,6 +46,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/Darwin/BLEManagerImpl.h

@@ -47,6 +47,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/EFR32/BLEManagerImpl.h

@@ -49,6 +49,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/ESP32/BLEManagerImpl.h

@@ -81,6 +81,7 @@ class BLEManagerImpl final : public BLEManager,
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/Linux/BLEManagerImpl.cpp

@@ -92,6 +92,14 @@ CHIP_ERROR BLEManagerImpl::_Init()
  return err;
 }
 
+CHIP_ERROR BLEManagerImpl::_Shutdown()
+{
+ // ensure scan resources are cleared (e.g. timeout timers)
+ mDeviceScanner.reset();
+
+ return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR BLEManagerImpl::_SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val)
 {
  CHIP_ERROR err = CHIP_NO_ERROR;

src/platform/Linux/BLEManagerImpl.h

@@ -112,6 +112,7 @@ class BLEManagerImpl final : public BLEManager,
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init();
+ CHIP_ERROR _Shutdown();
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode();
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled();

src/platform/P6/BLEManagerImpl.h

@@ -51,6 +51,7 @@ class BLEManagerImpl final : public BLEManager,
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/Tizen/BLEManagerImpl.h

@@ -55,6 +55,7 @@ class BLEManagerImpl final : public BLEManager,
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/Zephyr/BLEManagerImpl.h

@@ -50,6 +50,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/android/BLEManagerImpl.h

@@ -56,6 +56,7 @@ class BLEManagerImpl final : public BLEManager,
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init();
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode();
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled();

src/platform/cc13x2_26x2/BLEManagerImpl.h

@@ -205,6 +205,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/mbed/BLEManagerImpl.h

@@ -46,6 +46,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/nxp/k32w/k32w0/BLEManagerImpl.h

@@ -64,6 +64,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);

src/platform/qpg/BLEManagerImpl.h

@@ -48,6 +48,7 @@ class BLEManagerImpl final : public BLEManager, private BleLayer, private BlePla
  // ===== Members that implement the BLEManager internal interface.
 
  CHIP_ERROR _Init(void);
+ CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
  CHIPoBLEServiceMode _GetCHIPoBLEServiceMode(void);
  CHIP_ERROR _SetCHIPoBLEServiceMode(CHIPoBLEServiceMode val);
  bool _IsAdvertisingEnabled(void);