Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e933e38c authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Gerrit Code Review
Browse files

Merge changes from topic "cherrypicker-L83000030003604164:N29900030057840634" into main 

* changes:
  [Audiosharing] Fix address type usage in  QR code format if address not present
  [Audiosharing] Update QR code format to follow BT SIG standard
parents ad60df61 e4aaa19f

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothBroadcastUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -43,5 +43,5 @@ public final class BluetoothBroadcastUtils { 
    /**

     * Bluetooth scheme.

     */

    public static final String SCHEME_BT_BROADCAST_METADATA = "BT:";

    public static final String SCHEME_BT_BROADCAST_METADATA = "BLUETOOTH:UUID:184F;";

}

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExt.kt

+212 −187

File changed.

Preview size limit exceeded, changes collapsed.

packages/SettingsLib/tests/unit/src/com/android/settingslib/bluetooth/BluetoothLeBroadcastMetadataExtTest.kt

+60 −14

File changed.

Preview size limit exceeded, changes collapsed.