commit 4edd3719f5a7ce1956f96b68a7f7eba2daa44c58
author Sumit Bajpai <sbajpai@codeaurora.org> Fri Sep 20 16:09:42 2019 +0530
committer Sumit Bajpai <sbajpai@codeaurora.org> Mon Oct 14 15:32:02 2019 +0530
tree aeb4b51c95e5625e3367a3368ed437e5fbc10141
parent f106def1b76b1917732e49014de7c3b349f6fe16

Do not store volume if HAP device is active.

To avoid store wrong steam volume for A2DP device
when switch active devices from A2DP to Hearing Aid.
Only store volume for A2DP device when Hearing Aid
device are not active.

CRs-Fixed: 2544789
Change-Id: I19b71c59bd7c4445424a2f910f30f9642eaf6155

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 e515824..74e6aad 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -76,6 +76,7 @@
 import com.android.bluetooth.Utils;
 import com.android.bluetooth.avrcpcontroller.AvrcpControllerService;
 import com.android.bluetooth.ReflectionUtils;
+import com.android.bluetooth.hearingaid.HearingAidService;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -5250,6 +5251,18 @@
         int storeVolume =  mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
         Log.i(TAG, "storeVolume: Storing stream volume level for device " + device
                 + " : " + storeVolume);
+
+        List<BluetoothDevice> HAActiveDevices = null;
+        HearingAidService mHaService = HearingAidService.getHearingAidService();
+        if (mHaService != null) {
+          HAActiveDevices = mHaService.getActiveDevices();
+        }
+        if (HAActiveDevices != null && (HAActiveDevices.get(0) != null
+                || HAActiveDevices.get(1) != null)) {
+          Log.d(TAG, "Do not store volume when Hearing Aid device is active");
+          return;
+        }
+
         if (index != INVALID_DEVICE_INDEX && deviceFeatures[index].isAbsoluteVolumeSupportingDevice &&
            (mAbsVolThreshold > 0 && mAbsVolThreshold < mAudioStreamMax &&
            storeVolume > mAbsVolThreshold)) {