From 1dd060f84256e2d4f12f9b7c74b2d3690f091aa3 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 13 May 2020 17:43:24 -0700 Subject: [PATCH] AudioService BtHelper: fix isBluetoothScoOn() BtHelper.isBluetoothScoOn() should not return true if the BT headset profile is not connected. Bug: 154464603 Test: regression tests for calls over Bluetooth Change-Id: I7c075977be79810cc57f06426fb9eec01c72606c --- .../core/java/com/android/server/audio/BtHelper.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index 9e7b428d2cca0..b6ffcef8fef0f 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 @@ public class BtHelper { * @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; } /**