commit f4410d3d4efaab06a8fac473b1754c850f84a886
author tim peng <timhypeng@google.com> Thu Jun 04 23:59:37 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 04 23:59:37 2020 +0000
tree f8bc5949cadc8f9ec910627858ee772d0edf093e
parent c9db73b80897fa213c4c42bf4a3cc479d8bd6509
parent 5a9e58372a89d4557008c91b264b7a238a92ce4a

Merge " “Bluetooth Audio Codec” is not getting listed while searching for it using “keywords” from settings search tab" into rvc-dev

src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java

diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
index 8abe162..6735115 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
@@ -19,6 +19,7 @@
 import android.bluetooth.BluetoothA2dp;
 import android.content.Context;
 
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.development.BluetoothA2dpConfigStore;
 import com.android.settings.development.BluetoothServiceConnectionListener;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -31,7 +32,7 @@
  */
 public abstract class AbstractBluetoothPreferenceController extends
         DeveloperOptionsPreferenceController implements BluetoothServiceConnectionListener,
-        LifecycleObserver, OnDestroy {
+        LifecycleObserver, OnDestroy, PreferenceControllerMixin {
 
     protected volatile BluetoothA2dp mBluetoothA2dp;