Merge "Fix bugs in auto restriction." into pi-dev am: f6e2c19fcc

am: a9e4d4a42a Change-Id: If82969696eb492ea3875a0e0fb92f038024f00f9
2018-04-23 10:13:31 -07:00
parent 58625937e3 a9e4d4a42a
commit fca1b345cc
14 changed files with 234 additions and 51 deletions
--- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java
+++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java
@@ -73,7 +73,7 @@ public class SmartBatterySettings extends DashboardFragment {
        controllers.add(new SmartBatteryPreferenceController(context));
        if (settingsActivity != null && fragment != null) {
            controllers.add(
-                    new RestrictAppPreferenceController(settingsActivity, fragment));
+                    new RestrictAppPreferenceController(fragment));
        } else {
            controllers.add(new RestrictAppPreferenceController(context));
        }