Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I77443a8b,I894b36c6 into udc-dev

Browse Source 
* changes:
  RESTRICT AUTOMERGE AudioService: handle BT profile disconnections
  RESTRICT AUTOMERGE Revert "AudioService: handle BT profile disconnections"
This commit is contained in:
Andy Hung
2023-02-21 06:35:43 +00:00
committed by Android (Google) Code Review
parent fb49931775 26c305ad32
commit c5943960d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/audio/BtHelper.java
View File

@@ -563,7 +563,7 @@ public class BtHelper {
} }
// @GuardedBy("AudioDeviceBroker.mSetModeLock") // @GuardedBy("AudioDeviceBroker.mSetModeLock")
//@GuardedBy("AudioDeviceBroker.mDeviceStateLock") @GuardedBy("AudioDeviceBroker.mDeviceStateLock")
/*package*/ synchronized void onHeadsetProfileConnected(BluetoothHeadset headset) { /*package*/ synchronized void onHeadsetProfileConnected(BluetoothHeadset headset) {
// Discard timeout message // Discard timeout message
mDeviceBroker.handleCancelFailureToConnectToBtHeadsetService(); mDeviceBroker.handleCancelFailureToConnectToBtHeadsetService();
@@ -741,7 +741,7 @@ public class BtHelper {
case BluetoothProfile.HEADSET: case BluetoothProfile.HEADSET:
case BluetoothProfile.HEARING_AID: case BluetoothProfile.HEARING_AID:
case BluetoothProfile.LE_AUDIO: case BluetoothProfile.LE_AUDIO:
AudioService.sDeviceLogger.log(new AudioEventLogger.StringEvent( AudioService.sDeviceLogger.enqueue(new EventLogger.StringEvent(
"BT profile service: disconnecting " "BT profile service: disconnecting "
+ BluetoothProfile.getProfileName(profile) + " profile")); + BluetoothProfile.getProfileName(profile) + " profile"));
mDeviceBroker.postBtProfileDisconnected(profile); mDeviceBroker.postBtProfileDisconnected(profile);