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

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

Merge "Reject SCO connection for HFP if HFPC is connected" am: e83cfa05 

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



Change-Id: Ibe252675f30f0c71e911962b62e0b8eadf6c1fd1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d047173a e83cfa05

android/app/src/com/android/bluetooth/hfp/HeadsetService.java

+7 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ public class HeadsetService extends ProfileService { 


    private static final String DISABLE_INBAND_RINGING_PROPERTY =

            "persist.bluetooth.disableinbandringing";

    private static final String REJECT_SCO_IF_HFPC_CONNECTED_PROPERTY =

            "bluetooth.hfp.reject_sco_if_hfpc_connected";

    private static final ParcelUuid[] HEADSET_UUIDS = {BluetoothUuid.HSP, BluetoothUuid.HFP};

    private static final int[] CONNECTING_CONNECTED_STATES =

            {BluetoothProfile.STATE_CONNECTING, BluetoothProfile.STATE_CONNECTED};
@@ -2176,6 +2178,11 @@ public class HeadsetService extends ProfileService { 
                        + " is not the current active device " + mActiveDevice);

                return BluetoothStatusCodes.ERROR_NOT_ACTIVE_DEVICE;

            }

            if (SystemProperties.getBoolean(REJECT_SCO_IF_HFPC_CONNECTED_PROPERTY, false)

                    && isHeadsetClientConnected()) {

                Log.w(TAG, "isScoAcceptable: rejected SCO since HFPC is connected!");

                return BluetoothStatusCodes.ERROR_AUDIO_ROUTE_BLOCKED;

            }

            if (mForceScoAudio) {

                return BluetoothStatusCodes.SUCCESS;

            }