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

Commit 9c9e3286 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "API Changes needed for Blueooth apex to build" am: a83857b9 

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

Change-Id: Ia8e652307958b993b8a73e32f75a10ad385da6fe
parents badc5c5e a83857b9

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

+1 −1
Original line number Diff line number Diff line
@@ -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());

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

+1 −3
Original line number Diff line number Diff line
@@ -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),