commit 1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa
author Tony Mantler <nicoya@google.com> Tue Jun 13 13:09:25 2017 -0700
committer Tony Mantler <nicoya@google.com> Mon Jun 26 10:58:36 2017 -0700
tree 57a949e2cd7d90057cf387c07a6b215e002205e9
parent 4bac4215383227edf77a139e6f33bcc5689996b7

Make PreferenceController a mixin

Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00

src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java

diff --git a/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java b/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
index bde4dd0..10dbd19 100644
--- a/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/SafetyInfoPreferenceController.java
@@ -19,9 +19,11 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 
-import com.android.settings.core.PreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
 
-public class SafetyInfoPreferenceController extends PreferenceController {
+public class SafetyInfoPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final Intent INTENT_PROBE =
             new Intent("android.settings.SHOW_SAFETY_AND_REGULATORY_INFO");