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

Commit 718af4ba authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: f9504d89 

am: 0859a07a

Change-Id: I4307481f6df9b2ef9d07eb6066e8fda025bcd4e8
parents c1968ab9 0859a07a

src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu 
    public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {

    }



    @Override

    public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {

    }



    @Override

    public void register(boolean listening) {

        if (mBluetoothAdapter == null) {

src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -276,6 +276,9 @@ public abstract class DeviceListPreferenceFragment extends 


    public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }



    @Override

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



    /**

     * Return the key of the {@link PreferenceGroup} that contains the bluetooth devices

     */