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

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

Merge changes from topic "cherrypicker-L92400000960618248:N32200001368009453"... 

Merge changes from topic "cherrypicker-L92400000960618248:N32200001368009453" into udc-dev am: 9e9c0ae4 am: 623dc7e0

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



Change-Id: Ia30ad109133e6f8c3daaa84a0115c711cccca2ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53f47433 623dc7e0

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;

        }