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

Commit 5f1cd034 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix not using previous var when setting audio policy & change log level" am: f29a748b 

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



Change-Id: I0f8c3678ffb55a088a0c0db0a52d6ccc52aa85bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d672f50 f29a748b

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

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

        }