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

Commit 7e50dd1e authored Jan 28, 2022 by Zach Johnson Committed by Android (Google) Code Review Jan 28, 2022

Merge "API Changes needed for Blueooth apex to build"

parents 48d24517 0a7c5ec9

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1255,7 +1255,7 @@ public class CompanionDeviceManagerService extends SystemService
		}

		@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());

services/companion/java/com/android/server/companion/presence/BluetoothCompanionDeviceConnectionListener.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ class BluetoothCompanionDeviceConnectionListener
		*/
		@Override
		public void onDeviceDisconnected(@NonNull BluetoothDevice device,
		@DisconnectReason int reason) {
		int reason) {
		if (DEBUG) {
		Log.i(TAG, "onDevice_Disconnected() " + btDeviceToString(device));
		Log.d(TAG, " reason=" + disconnectReasonText(reason));

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -486,9 +486,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 BtProfileConnectionInfo(profile), "mBluetoothProfileServiceListener"));