[Linux] Fix BLE infinite advertising

src/platform/Linux/bluez/BluezAdvertisement.cpp

@@ -65,7 +65,7 @@ BluezLEAdvertisement1 * BluezAdvertisement::CreateLEAdvertisement()
     // Bluez to set "BR/EDR Not Supported" flag. Bluez doesn't provide API to do that explicitly
     // and the flag is necessary to force using LE transport.
     bluez_leadvertisement1_set_discoverable(adv, TRUE);
-    bluez_leadvertisement1_set_discoverable_timeout(adv, 0 /* infinite */);
+    // empty discoverable timeout for infinite discoverability
 
     // empty includes
     bluez_leadvertisement1_set_local_name(adv, mAdvName);

src/platform/Linux/dbus/bluez/DbusBluez.xml

@@ -108,13 +108,21 @@
     </method>
   </interface>
 
+  <!--
+  This interface shall be exported by Matter GATT application and registered
+  with org.bluez.GattManager1.RegisterApplication method.
+  -->
   <interface name="org.bluez.GattService1">
     <property name="UUID" type="s" access="read" />
     <property name="Device" type="o" access="read" />
     <property name="Primary" type="b" access="read" />
     <!-- <property name="Includes" type="ao" access="read" /> -->
   </interface>
 
+  <!--
+  This interface shall be exported by Matter GATT application and linked
+  with org.bluez.GattService1 object via the Service property.
+  -->
   <interface name="org.bluez.GattCharacteristic1">
     <method name="ReadValue">
       <arg name="options" type="a{sv}" direction="in"/>
@@ -152,6 +160,10 @@
     <property name="NotifyAcquired" type="b" access="read" />
   </interface>
 
+  <!--
+  This interface shall be exported by Matter GATT application and linked
+  with org.bluez.GattCharacteristic1 object via the Characteristic property.
+  -->
   <interface name="org.bluez.GattDescriptor1">
     <method name="ReadValue">
       <arg name="options" type="a{sv}" direction="in"/>
@@ -172,6 +184,10 @@
     </property>
   </interface>
 
+  <!--
+  This interface shall be exported by Matter GATT application and registered
+  with org.bluez.LEAdvertisingManager1.RegisterAdvertisement method.
+  -->
   <interface name="org.bluez.LEAdvertisement1">
     <method name="Release"/>
     <property name="Type" type="s" access="read"/>
@@ -183,13 +199,33 @@
     <property name="ServiceData" type="a{sv}" access="read"/>
     <property name="Data" type="a{yay}" access="read"/>
     <property name="Discoverable" type="b" access="read"/>
+    <!--
+    Do not expose discoverable timeout property, so BlueZ will set it
+    internally to zero, effectively disabling the timeout. Becase of BlueZ
+    bug, which is not fixed until BlueZ 5.73, exposing discoverable timeout
+    as zero will timout the advertisement immediately.
+
     <property name="DiscoverableTimeout" type="q" access="read"/>
+    -->
     <property name="Includes" type="as" access="read"/>
     <property name="LocalName" type="s" access="read"/>
     <property name="Appearance" type="q" access="read"/>
-    <!-- <property name="Duration" type="q" access="read"/> -->
-    <!-- <property name="Timeout" type="q" access="read"/> -->
-    <!-- <property name="SecondaryChannel" type="s" access="read"/> -->
+    <!--
+    Do not expose duration, so BlueZ will use the internal default value.
+
+    <property name="Duration" type="q" access="read"/>
+    -->
+    <!--
+    Do not expose timeout property, so BlueZ will not call the Release()
+    method after a timeout.
+
+    <property name="Timeout" type="q" access="read"/>
+    -->
+    <!--
+    We are not using SecondaryChannel property, so we do not expose it.
+
+    <property name="SecondaryChannel" type="s" access="read"/>
+    -->
     <property name="MinInterval" type="u" access="read"/>
     <property name="MaxInterval" type="u" access="read"/>
   </interface>