| commit | 974b242ed545df013308f46773645f571d395b47 | [log] [tgz] |
|---|---|---|
| author | tim peng <timhypeng@google.com> | Fri Jun 05 00:14:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 05 00:14:09 2020 +0000 |
| tree | 91c05b74d1d10b6a9cda32ed61f57a5074d074bf | |
| parent | cafdf2d230c28b3c5eee493d3d8e0c1dd334f27b [diff] | |
| parent | f4410d3d4efaab06a8fac473b1754c850f84a886 [diff] |
Merge " “Bluetooth Audio Codec” is not getting listed while searching for it using “keywords” from settings search tab" into rvc-dev am: f4410d3d4e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11700098 Change-Id: I8efb8a2c906d5862b7d46ab765d1c848733d2f25
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;