diff options
| author | 2022-02-12 12:29:30 +0000 | |
|---|---|---|
| committer | 2022-02-12 12:29:30 +0000 | |
| commit | 9c9e32865da845fa5ab896781e08da47338906da (patch) | |
| tree | 473029ef39440de1cf4f2f98bbe4c39a01196e2c | |
| parent | badc5c5ef491f48ac6f2ec2c6962a1ccc3307a1c (diff) | |
| parent | a83857b9e2c89bb4594846facb39888743a78862 (diff) | |
Merge "API Changes needed for Blueooth apex to build" am: a83857b9e2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1982327
Change-Id: Ia8e652307958b993b8a73e32f75a10ad385da6fe
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/BtHelper.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 30de4b416410..f6d05fa468e1 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -1569,7 +1569,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } @Override - public void onDeviceDisconnected(BluetoothDevice device, @DisconnectReason int reason) { + public void onDeviceDisconnected(BluetoothDevice device, int reason) { Slog.d(LOG_TAG, device.getAddress() + " disconnected w/ reason: (" + reason + ") " + BluetoothAdapter.BluetoothConnectionCallback.disconnectReasonText(reason)); CompanionDeviceManagerService.this.onDeviceDisconnected(device.getAddress()); diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index 1c299356a48c..f813ae011fee 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -490,9 +490,7 @@ public class BtHelper { return; } final BluetoothDevice btDevice = deviceList.get(0); - final @BluetoothProfile.BtProfileState int state = - proxy.getConnectionState(btDevice); - if (state == BluetoothProfile.STATE_CONNECTED) { + if (proxy.getConnectionState(btDevice) == BluetoothProfile.STATE_CONNECTED) { mDeviceBroker.queueOnBluetoothActiveDeviceChanged( new AudioDeviceBroker.BtDeviceChangedData(btDevice, null, new BluetoothProfileConnectionInfo(profile), |