commit c12ddbbc0633039d56b86ea48e3ca9ab96a8b09e
author Eric Laurent <elaurent@google.com> Thu May 14 15:16:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 14 15:16:52 2020 +0000
tree fbb632445980c336db9f88e06448e36039ebaaf0
parent 84e2f0c5821a6bb6d0b945673323879ec67e9cd2
parent 1dd060f84256e2d4f12f9b7c74b2d3690f091aa3

Merge "AudioService BtHelper: fix isBluetoothScoOn()" into rvc-dev

services/core/java/com/android/server/audio/BtHelper.java

diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java
index 9e7b428..b6ffcef 100644
--- a/services/core/java/com/android/server/audio/BtHelper.java
+++ b/services/core/java/com/android/server/audio/BtHelper.java
@@ -358,14 +358,11 @@
      * @return false if SCO isn't connected
      */
     /*package*/ synchronized boolean isBluetoothScoOn() {
-        if ((mBluetoothHeadset != null)
-                && (mBluetoothHeadset.getAudioState(mBluetoothHeadsetDevice)
-                != BluetoothHeadset.STATE_AUDIO_CONNECTED)) {
-            Log.w(TAG, "isBluetoothScoOn(true) returning false because "
-                    + mBluetoothHeadsetDevice + " is not in audio connected mode");
+        if (mBluetoothHeadset == null) {
             return false;
         }
-        return true;
+        return mBluetoothHeadset.getAudioState(mBluetoothHeadsetDevice)
+                == BluetoothHeadset.STATE_AUDIO_CONNECTED;
     }
 
     /**