Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5ec928b authored by Chris Tate's avatar Chris Tate Committed by android-build-merger
Browse files

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

am: b61aa590

Change-Id: I9abb3f735a2108fb98a5d0ac0fe6fbc5984d6bea
parents f254a59b b61aa590

services/core/java/com/android/server/job/JobSchedulerShellCommand.java

+42 −37
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ public class JobSchedulerShellCommand extends ShellCommand { 
        final String pkgName = getNextArgRequired();

        final int jobId = Integer.parseInt(getNextArgRequired());



        final long ident = Binder.clearCallingIdentity();

        try {

            int ret = mInternal.executeRunCommand(pkgName, userId, jobId, force);

            switch (ret) {

                case CMD_ERR_NO_PACKAGE:
@@ -147,6 +149,9 @@ public class JobSchedulerShellCommand extends ShellCommand { 
                    break;

            }

            return ret;

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }



    private int runMonitorBattery(PrintWriter pw) throws Exception {