From ddf48e39623ff5ddf3aa0bff1fad0e3eda7e8b82 Mon Sep 17 00:00:00 2001 From: Pavlin Radoslavov Date: Sun, 21 Jan 2018 02:04:45 -0800 Subject: [PATCH] Add Settings support for Bluetooth Multi-A2DP and Multi-HFP Test: Code compilation Bug: 64767509 [NOTE: The cherry-pick removed changes to non-existent code and log message description that doesn't apply here.] Change-Id: Iee76286110ed87703d6a968f50273c22cd7c7086 Merged-In: Iee76286110ed87703d6a968f50273c22cd7c7086 (cherry picked from commit 4b796e5d2ea23d45f67bd46590eddcac8b3148b4) --- .../android/settings/bluetooth/BluetoothSummaryUpdater.java | 4 ++++ .../settings/bluetooth/DeviceListPreferenceFragment.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java index 662cd701de2..43d25e7b49d 100644 --- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java @@ -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) { diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index 0485e69628b..f5abc41e8c8 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -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 */