Merge c320019fd34e11d843e74c0fee27e766c94bfa1b on remote branch
Change-Id: Ie1372f21330b108d5c5717c240eeec467e3b7716
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index c415690..32fc833 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -1685,12 +1685,6 @@
boolean tws_switch = false;
Log.d(TAG, "MSG_SET_ACTIVE_DEVICE");
BluetoothDevice bt_device = (BluetoothDevice) msg.obj;
- if (bt_device == null) {
- for (int i = 0; i < maxAvrcpConnections; i++) {
- deviceFeatures[i].isActiveDevice = false;
- }
- break;
- }
if (bt_device != null && bt_device.isTwsPlusDevice()) {
for (int i = 0; i < maxAvrcpConnections; i++) {
if (deviceFeatures[i].mCurrentDevice != null &&
@@ -5370,8 +5364,15 @@
public void setActiveDevice(BluetoothDevice device) {
Log.w(TAG, "setActiveDevice call for device " + device);
- Message msg = mHandler.obtainMessage(MSG_SET_ACTIVE_DEVICE, 0, 0, device);
- mHandler.sendMessage(msg);
+ if (device == null) {
+ for (int i = 0; i < maxAvrcpConnections; i++) {
+ deviceFeatures[i].isActiveDevice = false;
+ }
+ }
+ else {
+ Message msg = mHandler.obtainMessage(MSG_SET_ACTIVE_DEVICE, 0, 0, device);
+ mHandler.sendMessage(msg);
+ }
}
private SharedPreferences getVolumeMap() {
diff --git a/system_bt_ext/conf/interop_database.conf b/system_bt_ext/conf/interop_database.conf
index 536990d..a47620b 100644
--- a/system_bt_ext/conf/interop_database.conf
+++ b/system_bt_ext/conf/interop_database.conf
@@ -384,7 +384,8 @@
BMW 99999 = Name_Based
E4:19:C1 = Address_Based
FreeBuds 3 = Name_Based
-
+AirPods Pro = Name_Based
+f0:5c:d5 = Address_Based
#E0:D1:E6 = Address_Based
#00:18:6b = Address_Based
#20:3c:ae = Address_Based