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

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

Merge changes from topic "cherrypicker-L92400000960618248:N32200001368009453" into udc-dev 

* changes:
  [automerge] Fix not using previous var when setting audio policy & change log level 2p: 01368db4
  Fix not using previous var when setting audio policy & change log level
parents 9ae99891 f45ed4c6

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

+2 −2
Original line number Diff line number Diff line
@@ -1354,7 +1354,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());
@@ -2242,7 +2242,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;

        }