diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-16 19:34:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-16 19:34:57 +0000 |
| commit | 2b80990bbcadd557b0c4cfe45d410d2aaeae3dee (patch) | |
| tree | b3e14d0d96d90b72e9113b11c8ea512d27d51961 | |
| parent | 56cd4dcad580061f53b938dc48fa7933614dff0f (diff) | |
| parent | 18c5870551b154de1387cd084011115bd6fc6d3b (diff) | |
Merge "Don't run jobs in apps performing full-data backup" into rvc-dev
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java index 07a99084e9d5..2aa2275cc67b 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java @@ -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; } |