Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 138b148a authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

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

Change-Id: Icffc901b24d7fa6863b820b22e16062b0a540878
parents 69e01568 c12ddbbc

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

+3 −6
Original line number Diff line number Diff line
@@ -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;

    }



    /**