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

Commit eb0d7c37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't run jobs in apps performing full-data backup" into rvc-dev am: 2b80990b 

Change-Id: I0929d2f148dceceee7274dabd86c6f381cb9284a
parents 4e3c5c07 2b80990b

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+8 −5
Original line number Diff line number Diff line
@@ -2182,17 +2182,18 @@ public class JobSchedulerService extends com.android.server.SystemService 
        }



        final boolean jobExists = mJobs.containsJob(job);



        final boolean userStarted = areUsersStartedLocked(job);

        final boolean backingUp = mBackingUpUids.indexOfKey(job.getSourceUid()) >= 0;



        if (DEBUG) {

            Slog.v(TAG, "isReadyToBeExecutedLocked: " + job.toShortString()

                    + " exists=" + jobExists + " userStarted=" + userStarted);

                    + " exists=" + jobExists + " userStarted=" + userStarted

                    + " backingUp=" + backingUp);

        }



        // These are also fairly cheap to check, though they typically will not

        // be conditions we fail.

        if (!jobExists || !userStarted) {

        if (!jobExists || !userStarted || backingUp) {

            return false;

        }
@@ -2265,15 +2266,17 @@ public class JobSchedulerService extends com.android.server.SystemService 


        final boolean jobExists = mJobs.containsJob(job);

        final boolean userStarted = areUsersStartedLocked(job);

        final boolean backingUp = mBackingUpUids.indexOfKey(job.getSourceUid()) >= 0;



        if (DEBUG) {

            Slog.v(TAG, "areComponentsInPlaceLocked: " + job.toShortString()

                    + " exists=" + jobExists + " userStarted=" + userStarted);

                    + " exists=" + jobExists + " userStarted=" + userStarted

                    + " backingUp=" + backingUp);

        }



        // These are also fairly cheap to check, though they typically will not

        // be conditions we fail.

        if (!jobExists || !userStarted) {

        if (!jobExists || !userStarted || backingUp) {

            return false;

        }