Merge commit '5310c0e71f2fa352b9cf5b66c8e474babc1aba61' into remote branch
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 8c8062a..7378261 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -190,6 +190,7 @@
"00:04:79", //00-04-79-00-06-bc, Name: radius HP-BTL01
"28:A1:83", //28-A1-83-94-90-AE, Name: VW Radio
"30:c3:d9", //30-c3-d9-8d-5b-83, Name: VW RadioBin
+ "24:df:6a", //24-df-6a-f4-0a-7e, Name: HUAWEI WATCH
};
private static final String playerStateUpdateBlackListedNames[] = {
"Audi",
@@ -1657,6 +1658,12 @@
boolean PlayReq = (msg.arg1 == 1);
boolean isRetry = (msg.arg2 == 1);
boolean ret;
+ BluetoothDevice prevActiveDevice = mA2dpService.getActiveDevice();
+ if(Objects.equals(dev, prevActiveDevice)) {
+ isShoActive = false;
+ Log.w(TAG, dev + " device is already active");
+ break;
+ }
ret = mA2dpService.startSHO(dev);
if(!ret) {
isShoActive = false;
diff --git a/system_bt_ext/conf/interop_database.conf b/system_bt_ext/conf/interop_database.conf
index c079694..9e0c792 100644
--- a/system_bt_ext/conf/interop_database.conf
+++ b/system_bt_ext/conf/interop_database.conf
@@ -273,7 +273,9 @@
#0x00-1a-7d-82-36-4b ==> Name: 66 Audio BTS
#0x88-e6-03-80-48-6b ==> Name: XB10
#0xb8-69-c2-eb-ae-66 ==> Name: SRS-XB3
-#0x58-e2-8f-e9-09-7b ==> Name: BeatsStudio Wireless
+#0x58-e2-8f-e9-09-7b ==> Name: BeatsStudio Wireless
+#0xE4-19-C1-DC-10-10 ==> Name: FreeBuds 3
+#0xa0-56-b2-2b-43-ec ==> Name: MB Bluetooth
#CarKits
#0x94-b2-cc-28-99-77 ==> Name: AVH-X5890BT ==>pioneer
#0x74-5e-1c-98-88-64 ==> Name: AVH-X5790BT ==>pioneer
@@ -374,9 +376,11 @@
Samsung Level On = Name_Based
a0:56:b2 = Address_Based
BMW 08939 = Name_Based
+MB Bluetooth = Name_Based
94:e3:6d = Address_Based
BMW 99999 = Name_Based
-
+E4:19:C1 = Address_Based
+FreeBuds 3 = Name_Based
#E0:D1:E6 = Address_Based
#00:18:6b = Address_Based