commit 5eb33357ab7e9111cd647f9b74d68ef4ed040b7c
author Gurpreet Ghai <gghai@codeaurora.org> Wed Oct 16 16:42:52 2019 +0530
committer Gurpreet Ghai <gghai@codeaurora.org> Wed Oct 16 17:39:08 2019 +0530
tree af89b832c4fb3eceae4c4add65a53dfd3fb7e57f
parent 5ed56d79cd4fc1935a1e2decec9d02dc8f98543f

BT: Never store value greater than threshold volume

- Threshold volume value is stored when current
  remote volume is too high.
- During BT Off, race condition with cleanup lead
  to saving volume value greater than threshold
- This change ensures that volume greater than
  threshold value is not stored.

CRs-Fixed: 2543773

Change-Id: I23f30e367bcf4daabd808b411408ac12d0107b64

packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java

diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 16772d5..7491097 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -5278,12 +5278,11 @@
           return;
         }
 
-        if (index != INVALID_DEVICE_INDEX && deviceFeatures[index].isAbsoluteVolumeSupportingDevice &&
-           (mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax &&
-           storeVolume > mAbsVolThreshold)) {
+        if (mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax &&
+           storeVolume > mAbsVolThreshold) {
             if (DEBUG) Log.v(TAG, "remote store volume too high" + storeVolume + ">" +
                mAbsVolThreshold);
-                storeVolume = mAbsVolThreshold;
+            storeVolume = mAbsVolThreshold;
         }
         if (index == INVALID_DEVICE_INDEX && disconnectedActiveDevice != null &&
             disconnectedActiveDevice.equals(device)) {