Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 'jobscheduler run' shell command" into oc-dev

Browse Source
This commit is contained in:
Chris Tate
2017-04-27 22:03:53 +00:00
committed by Android (Google) Code Review
parent a851b5ae76 851a35abe8
commit cfdc7eb87c
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
services/core/java/com/android/server/job/JobSchedulerShellCommand.java
View File

@@ -109,44 +109,49 @@ public class JobSchedulerShellCommand extends ShellCommand {
final String pkgName = getNextArgRequired(); final String pkgName = getNextArgRequired();
final int jobId = Integer.parseInt(getNextArgRequired()); final int jobId = Integer.parseInt(getNextArgRequired());
int ret = mInternal.executeRunCommand(pkgName, userId, jobId, force); final long ident = Binder.clearCallingIdentity();
switch (ret) { try {
case CMD_ERR_NO_PACKAGE: int ret = mInternal.executeRunCommand(pkgName, userId, jobId, force);
pw.print("Package not found: "); switch (ret) {
pw.print(pkgName); case CMD_ERR_NO_PACKAGE:
pw.print(" / user "); pw.print("Package not found: ");
pw.println(userId); pw.print(pkgName);
break; pw.print(" / user ");
pw.println(userId);
break;
case CMD_ERR_NO_JOB: case CMD_ERR_NO_JOB:
pw.print("Could not find job "); pw.print("Could not find job ");
pw.print(jobId); pw.print(jobId);
pw.print(" in package "); pw.print(" in package ");
pw.print(pkgName); pw.print(pkgName);
pw.print(" / user "); pw.print(" / user ");
pw.println(userId); pw.println(userId);
break; break;
case CMD_ERR_CONSTRAINTS: case CMD_ERR_CONSTRAINTS:
pw.print("Job "); pw.print("Job ");
pw.print(jobId); pw.print(jobId);
pw.print(" in package "); pw.print(" in package ");
pw.print(pkgName); pw.print(pkgName);
pw.print(" / user "); pw.print(" / user ");
pw.print(userId); pw.print(userId);
pw.println(" has functional constraints but --force not specified"); pw.println(" has functional constraints but --force not specified");
break; break;
default: default:
// success! // success!
pw.print("Running job"); pw.print("Running job");
if (force) { if (force) {
pw.print(" [FORCED]"); pw.print(" [FORCED]");
} }
pw.println(); pw.println();
break; break;
}
return ret;
} finally {
Binder.restoreCallingIdentity(ident);
} }
return ret;
} }
private int runMonitorBattery(PrintWriter pw) throws Exception { private int runMonitorBattery(PrintWriter pw) throws Exception {