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

Merge "API Changes needed for Blueooth apex to build" am: a83857b9e2 am: 9c9e32865d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1982327

Change-Id: I05fbb5258850a441b8c7b45ee66d09129bd2991e
This commit is contained in:
Treehugger Robot
2022-02-12 12:41:29 +00:00
committed by Automerger Merge Worker
parent 07fd16cd7d 9c9e32865d
commit 4ae10fe110
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -1576,7 +1576,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
} }
@Override @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 + ") " Slog.d(LOG_TAG, device.getAddress() + " disconnected w/ reason: (" + reason + ") "
+ BluetoothAdapter.BluetoothConnectionCallback.disconnectReasonText(reason)); + BluetoothAdapter.BluetoothConnectionCallback.disconnectReasonText(reason));
CompanionDeviceManagerService.this.onDeviceDisconnected(device.getAddress()); CompanionDeviceManagerService.this.onDeviceDisconnected(device.getAddress());

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

@@ -490,9 +490,7 @@ public class BtHelper {
return; return;
} }
final BluetoothDevice btDevice = deviceList.get(0); final BluetoothDevice btDevice = deviceList.get(0);
final @BluetoothProfile.BtProfileState int state = if (proxy.getConnectionState(btDevice) == BluetoothProfile.STATE_CONNECTED) {
proxy.getConnectionState(btDevice);
if (state == BluetoothProfile.STATE_CONNECTED) {
mDeviceBroker.queueOnBluetoothActiveDeviceChanged( mDeviceBroker.queueOnBluetoothActiveDeviceChanged(
new AudioDeviceBroker.BtDeviceChangedData(btDevice, null, new AudioDeviceBroker.BtDeviceChangedData(btDevice, null,
new BluetoothProfileConnectionInfo(profile), new BluetoothProfileConnectionInfo(profile),