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

Commit e95e22bd authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE AudioService: handle BT profile disconnections am: 26c305ad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21514790



Change-Id: Icf8b18dd31f2ea08273173b6f7f698d61d464f19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11896031 26c305ad

services/core/java/com/android/server/audio/BtHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ public class BtHelper { 
    }



    // @GuardedBy("AudioDeviceBroker.mSetModeLock")

    //@GuardedBy("AudioDeviceBroker.mDeviceStateLock")

    @GuardedBy("AudioDeviceBroker.mDeviceStateLock")

    /*package*/ synchronized void onHeadsetProfileConnected(BluetoothHeadset headset) {

        // Discard timeout message

        mDeviceBroker.handleCancelFailureToConnectToBtHeadsetService();
@@ -741,7 +741,7 @@ public class BtHelper { 
                        case BluetoothProfile.HEADSET:

                        case BluetoothProfile.HEARING_AID:

                        case BluetoothProfile.LE_AUDIO:

                            AudioService.sDeviceLogger.log(new AudioEventLogger.StringEvent(

                            AudioService.sDeviceLogger.enqueue(new EventLogger.StringEvent(

                                    "BT profile service: disconnecting "

                                        + BluetoothProfile.getProfileName(profile) + " profile"));

                            mDeviceBroker.postBtProfileDisconnected(profile);