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

Commit c5943960 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge changes I77443a8b,I894b36c6 into udc-dev 

* changes:
  RESTRICT AUTOMERGE AudioService: handle BT profile disconnections
  RESTRICT AUTOMERGE Revert "AudioService: handle BT profile disconnections"
parents fb499317 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);