Merge "Added option to check if an app is whitelisted for deviceidle." into nyc-dev

This commit is contained in:
Felipe Leme
2016-02-17 00:46:36 +00:00
committed by Android (Google) Code Review

View File

@@ -1262,6 +1262,12 @@ public class DeviceIdleController extends SystemService
return false; return false;
} }
public boolean getPowerSaveWhitelistAppInternal(String name) {
synchronized (this) {
return mPowerSaveWhitelistUserApps.containsKey(name);
}
}
public String[] getSystemPowerWhitelistExceptIdleInternal() { public String[] getSystemPowerWhitelistExceptIdleInternal() {
synchronized (this) { synchronized (this) {
int size = mPowerSaveWhitelistAppsExceptIdle.size(); int size = mPowerSaveWhitelistAppsExceptIdle.size();
@@ -2307,8 +2313,8 @@ public class DeviceIdleController extends SystemService
android.Manifest.permission.DEVICE_POWER, null); android.Manifest.permission.DEVICE_POWER, null);
do { do {
if (arg.length() < 1 || (arg.charAt(0) != '-' if (arg.length() < 1 || (arg.charAt(0) != '-'
&& arg.charAt(0) != '+')) { && arg.charAt(0) != '+' && arg.charAt(0) != '=')) {
pw.println("Package must be prefixed with + or -: " + arg); pw.println("Package must be prefixed with +, -, or =: " + arg);
return -1; return -1;
} }
char op = arg.charAt(0); char op = arg.charAt(0);
@@ -2319,10 +2325,12 @@ public class DeviceIdleController extends SystemService
} else { } else {
pw.println("Unknown package: " + pkg); pw.println("Unknown package: " + pkg);
} }
} else { } else if (op == '-') {
if (removePowerSaveWhitelistAppInternal(pkg)) { if (removePowerSaveWhitelistAppInternal(pkg)) {
pw.println("Removed: " + pkg); pw.println("Removed: " + pkg);
} }
} else {
pw.println(getPowerSaveWhitelistAppInternal(pkg));
} }
} while ((arg=shell.getNextArg()) != null); } while ((arg=shell.getNextArg()) != null);
} else { } else {