Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Icffc901b24d7fa6863b820b22e16062b0a540878
This commit is contained in:
Eric Laurent
2020-05-15 15:51:35 +00:00
committed by Automerger Merge Worker
parent 69e01568a4 c12ddbbc06
commit 138b148a96
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/audio/BtHelper.java
View File

@@ -358,14 +358,11 @@ public class BtHelper {
* @return false if SCO isn't connected * @return false if SCO isn't connected
*/ */
/*package*/ synchronized boolean isBluetoothScoOn() { /*package*/ synchronized boolean isBluetoothScoOn() {
if ((mBluetoothHeadset != null) 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");
return false; return false;
} }
return true; return mBluetoothHeadset.getAudioState(mBluetoothHeadsetDevice)
== BluetoothHeadset.STATE_AUDIO_CONNECTED;
} }
/** /**