Merge "Add easy way to get device idle whitelist." into mnc-dev

This commit is contained in:
Dianne Hackborn
2015-07-06 22:24:50 +00:00
committed by Android (Google) Code Review

View File

@@ -1236,6 +1236,8 @@ public class DeviceIdleController extends SystemService
pw.println(" Re-enable device idle mode after it had previously been disabled."); pw.println(" Re-enable device idle mode after it had previously been disabled.");
pw.println(" enabled"); pw.println(" enabled");
pw.println(" Print 1 if device idle mode is currently enabled, else 0."); pw.println(" Print 1 if device idle mode is currently enabled, else 0.");
pw.println(" whitelist");
pw.println(" Print currently whitelisted apps.");
pw.println(" whitelist [package ...]"); pw.println(" whitelist [package ...]");
pw.println(" Add (prefix with +) or remove (prefix with -) packages."); pw.println(" Add (prefix with +) or remove (prefix with -) packages.");
pw.println(" tempwhitelist [package ..]"); pw.println(" tempwhitelist [package ..]");
@@ -1314,6 +1316,7 @@ public class DeviceIdleController extends SystemService
long token = Binder.clearCallingIdentity(); long token = Binder.clearCallingIdentity();
try { try {
i++; i++;
if (i < args.length) {
while (i < args.length) { while (i < args.length) {
arg = args[i]; arg = args[i];
i++; i++;
@@ -1336,6 +1339,22 @@ public class DeviceIdleController extends SystemService
} }
} }
} }
} else {
synchronized (this) {
for (int j=0; j<mPowerSaveWhitelistApps.size(); j++) {
pw.print("system,");
pw.print(mPowerSaveWhitelistApps.keyAt(j));
pw.print(",");
pw.println(mPowerSaveWhitelistApps.valueAt(j));
}
for (int j=0; j<mPowerSaveWhitelistUserApps.size(); j++) {
pw.print("user,");
pw.print(mPowerSaveWhitelistUserApps.keyAt(j));
pw.print(",");
pw.println(mPowerSaveWhitelistUserApps.valueAt(j));
}
}
}
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }