TWS_AVRCP: Fix for above the threshold volume set after BT off/on
-Fix to set the volume level to threshold if the volume level is
set above threshold during BT toggle. If the non-active earbud
is disconnected last, disconnected active device is updated with
non-active earbud and when a2dp service calls to store the volume
disconnected active device was not checked for TWS+ pair so
the stream volume was stored though it was above threshold.
Change-Id: Ib9d7614c809cec3799f28229d3c1e8bbdb3a55e3
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index d001554..ec97714 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -5275,7 +5275,8 @@
storeVolume = mAbsVolThreshold;
}
if (index == INVALID_DEVICE_INDEX && disconnectedActiveDevice != null &&
- disconnectedActiveDevice.equals(device)) {
+ (disconnectedActiveDevice.equals(device)
+ || isTwsPlusPair(disconnectedActiveDevice, device))) {
Log.v(TAG, "No need to store volume again during avrcp disconnect volume is stored");
disconnectedActiveDevice = null;
return;
@@ -5286,9 +5287,9 @@
AdapterService mAdapterService = AdapterService.getAdapterService();
BluetoothDevice peerDevice = mAdapterService.getTwsPlusPeerDevice(device);
if (peerDevice != null && getIndexForDevice(peerDevice) != INVALID_DEVICE_INDEX)
- Log.d(TAG,"storeVolume to TWS+ pair device " + device + " : " + storeVolume);
+ Log.d(TAG,"storeVolume to TWS+ pair device " + peerDevice + " : " + storeVolume);
mVolumeMap.put(peerDevice, storeVolume);
- pref.putInt(device.getAddress(), storeVolume);
+ pref.putInt(peerDevice.getAddress(), storeVolume);
}
// Always use apply() since it is asynchronous, otherwise the call can hang waiting for
// storage to be written.