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

Commit 04084ad5 authored by Ryan Lin's avatar Ryan Lin Committed by android-build-merger
Browse files

Merge "Add callback onProfileAudioStateChanged()" into pi-dev 

am: a29957d5

Change-Id: I781527469bd558617dee57ed431d072ab629705d
parents 893b56a4 a29957d5

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothCallback.java

+1 −0
Original line number Diff line number Diff line
@@ -29,4 +29,5 @@ public interface BluetoothCallback { 
    void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState);

    void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state);

    void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile);

    void onProfileAudioStateChanged(int bluetoothProfile, int state);

}

packages/SystemUI/src/com/android/systemui/keyboard/KeyboardUI.java

+3 −0
Original line number Diff line number Diff line
@@ -611,6 +611,9 @@ public class KeyboardUI extends SystemUI implements InputManager.OnTabletModeCha 
        @Override

        public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice,

                                          int bluetoothProfile) { }



        @Override

        public void onProfileAudioStateChanged(int bluetoothProfile, int state) { }

    }



    private final class BluetoothErrorListener implements Utils.ErrorListener {

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -279,6 +279,9 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa 
    @Override

    public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {}



    @Override

    public void onProfileAudioStateChanged(int bluetoothProfile, int state) {}



    private ActuallyCachedState getCachedState(CachedBluetoothDevice device) {

        ActuallyCachedState state = mCachedState.get(device);

        if (state == null) {