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

Commit f185c9bc authored by William Escande's avatar William Escande
Browse files

API Changes needed for Blueooth apex to build 

Bug: 216476895
Test: Compile
Tag: #refactor
Merged-In: Ia7741309719e1f46c8c18c81b65c8862bca814e1
Change-Id: Ia7741309719e1f46c8c18c81b65c8862bca814e1
parent 4ff7b1d7

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),