commit bd5eb264d2452f8c19555aab772278275a5de306
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Thu Feb 20 23:15:31 2020 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Thu Feb 20 23:15:31 2020 +0000
tree 520a18ba4d5ee7fc20c8d4d896781ff7d0ec38b6
parent d0df71b1dd479f197a224ce5d26b81647ac9725e
parent 359c0fd41319d6d99495610a6a012cbdeacc47b4

Snap for 6222814 from 359c0fd41319d6d99495610a6a012cbdeacc47b4 to q-keystone-qcom-release

Change-Id: Ic0ae8eaaffd00fadf3b584206ccf59284fc283fc

src/com/android/bluetooth/hfp/HeadsetA2dpSync.java

diff --git a/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java b/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java
index 8adbdf2..d21d8b6 100644
--- a/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java
+++ b/src/com/android/bluetooth/hfp/HeadsetA2dpSync.java
@@ -38,6 +38,8 @@
 import android.util.Log;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import com.android.bluetooth.hearingaid.HearingAidService;
+import java.util.List;
 
 /**
  * Defines methods used for synchronization between HFP and A2DP
@@ -113,6 +115,17 @@
      */
     public boolean suspendA2DP(int reason, BluetoothDevice device){
         int a2dpState = isA2dpPlaying();
+
+        List<BluetoothDevice> HAActiveDevices = null;
+        HearingAidService mHaService = HearingAidService.getHearingAidService();
+        if (mHaService != null) {
+            HAActiveDevices = mHaService.getActiveDevices();
+        }
+        if (HAActiveDevices != null) {
+            Log.d(TAG,"Ignore suspendA2DP if active device is HearingAid");
+            return false;
+        }
+
         Log.d(TAG," suspendA2DP currPlayingState = "+ a2dpState + " for reason " + reason
               + "mA2dpSuspendTriggered = " + mA2dpSuspendTriggered + " for device " + device);
         if (mA2dpSuspendTriggered != A2DP_SUSPENDED_NOT_TRIGGERED) {