commit 499cc049d566ef3960fbf12f81b374f07b619f4d
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 30 00:51:36 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Jul 30 00:51:36 2020 -0700
tree 39b16ca0b1f88e88448f66392c9c4a7434f844e9
parent d02387a56c83a997fb3dcb88b3aa01706ab43bae
parent 0272134ade7bc77fdd29965827aeab32d32389cf

Merge 0272134ade7bc77fdd29965827aeab32d32389cf on remote branch

Change-Id: Ib7c7dd57c6dfbfeaff6ed5fe78360e177f953062

src/com/android/bluetooth/a2dp/A2dpService.java

diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index 38ba2d6..d722e67 100755
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -575,6 +575,7 @@
     private boolean connectionAllowedCheckMaxDevices(BluetoothDevice device) {
         int connected = 0;
         int tws_device = 0;
+
         // Count devices that are in the process of connecting or already connected
         synchronized (mBtA2dpLock) {
              for (A2dpStateMachine sm : mStateMachines.values()) {
@@ -597,14 +598,16 @@
         }
         Log.d(TAG,"connectionAllowedCheckMaxDevices connected = " + connected +
               "tws connected = " + tws_device);
-        synchronized (mVariableLock) {
-            if (mAdapterService != null &&  mAdapterService.isVendorIntfEnabled() &&
-                ((tws_device > 0) || mAdapterService.isTwsPlusDevice(device) ||
-                ((tws_device > 0) && connected == mMaxConnectedAudioDevices &&
-                !mAdapterService.isTwsPlusDevice(device)))) {
-                return isConnectionAllowed(device, tws_device, connected);
+        synchronized (mBtA2dpLock) {
+            Log.d(TAG, "Going to acquire mVariableLock");
+            synchronized (mVariableLock) {
+                if (mAdapterService != null &&  mAdapterService.isVendorIntfEnabled() &&
+                    ((tws_device > 0) || mAdapterService.isTwsPlusDevice(device))) {
+                    return isConnectionAllowed(device, tws_device, connected);
+                }
             }
         }
+
         if (mSetMaxConnectedAudioDevices == 1 &&
             connected == mSetMaxConnectedAudioDevices) {
             disconnectExisting = true;

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

diff --git a/src/com/android/bluetooth/hfp/HeadsetService.java b/src/com/android/bluetooth/hfp/HeadsetService.java
index 421ec73..4488dc8 100755
--- a/src/com/android/bluetooth/hfp/HeadsetService.java
+++ b/src/com/android/bluetooth/hfp/HeadsetService.java
@@ -129,8 +129,6 @@
     private boolean mIsTwsPlusEnabled = false;
     private boolean mIsTwsPlusShoEnabled = false;
     private vendorhfservice  mVendorHf;
-    private Context mContext = null;
-    private AudioServerStateCallback mServerStateCallback = new AudioServerStateCallback();
 
     @Override
     public IProfileServiceBinder initBinder() {
@@ -229,11 +227,6 @@
             mVendorHf.enableSwb(isSwbEnabled());
         }
 
-        Log.d(TAG, "registering audio server state callback");
-        mContext = getApplicationContext();
-        Executor exec = mContext.getMainExecutor();
-        mSystemInterface.getAudioManager().setAudioServerStateCallback(exec, mServerStateCallback);
-
         Log.i(TAG, " HeadsetService Started ");
         return true;
     }
@@ -432,30 +425,6 @@
         }
     }
 
-    private class AudioServerStateCallback extends AudioManager.AudioServerStateCallback {
-        @Override
-        public void onAudioServerDown() {
-            Log.d(TAG, "notifying onAudioServerDown");
-        }
-
-        @Override
-        public void onAudioServerUp() {
-            Log.d(TAG, "notifying onAudioServerUp");
-            if (isAudioOn()) {
-                Log.d(TAG, "onAudioServerUp: Audio is On, Notify HeadsetStateMachine");
-                synchronized (mStateMachines) {
-                    for (HeadsetStateMachine stateMachine : mStateMachines.values()) {
-                        if (stateMachine.getAudioState()
-                                == BluetoothHeadset.STATE_AUDIO_CONNECTED) {
-                            stateMachine.onAudioServerUp();
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     private final BroadcastReceiver mHeadsetReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {

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

diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 9c0e9db..ceef453 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -1592,13 +1592,16 @@
     class MyAudioServerStateCallback extends AudioManager.AudioServerStateCallback {
         @Override
         public void onAudioServerDown() {
-            logi("onAudioServerDown");
+            Log.i(TAG, "onAudioServerDown");
         }
 
         @Override
         public void onAudioServerUp() {
-            logi("onAudioServerUp restoring audio parameters");
+            Log.i(TAG, "onAudioSeverUp: restoring audio parameters");
+            mSystemInterface.getAudioManager().setBluetoothScoOn(false);
+            mSystemInterface.getAudioManager().setParameters("A2dpSuspended=true");
             setAudioParameters();
+            mSystemInterface.getAudioManager().setBluetoothScoOn(true);
         }
     }
 
@@ -1919,14 +1922,6 @@
         return true;
     }
 
-    public void onAudioServerUp() {
-        Log.i(TAG, "onAudioSeverUp: restore audio parameters");
-        mSystemInterface.getAudioManager().setBluetoothScoOn(false);
-        mSystemInterface.getAudioManager().setParameters("A2dpSuspended=true");
-        setAudioParameters();
-        mSystemInterface.getAudioManager().setBluetoothScoOn(true);
-    }
-
     /*
      * Put the AT command, company ID, arguments, and device in an Intent and broadcast it.
      */