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

Commit ac1a1c44 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix not using previous var when setting audio policy & change log... 

Merge "Fix not using previous var when setting audio policy & change log level" into tm-mainline-prod
parents 814c700a 01368db4

android/app/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java

+2 −2
Original line number Diff line number Diff line
@@ -1353,7 +1353,7 @@ public class HeadsetClientStateMachine extends StateMachine { 
            //   2. remote device supports audio policy

            if (mForceSetAudioPolicyProperty

                    && getAudioPolicyRemoteSupported() == BluetoothStatusCodes.FEATURE_SUPPORTED) {

                setAudioPolicy(new BluetoothSinkAudioPolicy.Builder()

                setAudioPolicy(new BluetoothSinkAudioPolicy.Builder(mHsClientAudioPolicy)

                        .setActiveDevicePolicyAfterConnection(mConnectingTimePolicyProperty)

                        .setInBandRingtonePolicy(mInBandRingtonePolicyProperty)

                        .build());
@@ -2241,7 +2241,7 @@ public class HeadsetClientStateMachine extends StateMachine { 
        mHsClientAudioPolicy = policies;



        if (getAudioPolicyRemoteSupported() != BluetoothStatusCodes.FEATURE_SUPPORTED) {

            Log.e(TAG, "Audio Policy feature not supported!");

            Log.i(TAG, "Audio Policy feature not supported!");

            return;

        }