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

Commit f45ed4c6 authored by Eric Shih's avatar Eric Shih Committed by Presubmit Automerger Backend
Browse files

[automerge] Fix not using previous var when setting audio policy & change log level 2p: 01368db4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/23181157

Bug: 281970923
Bug: 263323082
Change-Id: I94772adac60b823a20f37756867c230e508831be
Merged-In: I20eb76aad6ecdcdf4cc47289735d72d5c1e2da1f
parents 466fb9c4 01368db4

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;

        }