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

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

Browse Source 
Change-Id: I0929d2f148dceceee7274dabd86c6f381cb9284a
This commit is contained in:
TreeHugger Robot
2020-04-16 19:37:08 +00:00
committed by Automerger Merge Worker
parent 4e3c5c070d 2b80990bbc
commit eb0d7c37da
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java
View File

@@ -2182,17 +2182,18 @@ public class JobSchedulerService extends com.android.server.SystemService
} }
final boolean jobExists = mJobs.containsJob(job); final boolean jobExists = mJobs.containsJob(job);
final boolean userStarted = areUsersStartedLocked(job); final boolean userStarted = areUsersStartedLocked(job);
final boolean backingUp = mBackingUpUids.indexOfKey(job.getSourceUid()) >= 0;
if (DEBUG) { if (DEBUG) {
Slog.v(TAG, "isReadyToBeExecutedLocked: " + job.toShortString() 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 // These are also fairly cheap to check, though they typically will not
// be conditions we fail. // be conditions we fail.
if (!jobExists || !userStarted) { if (!jobExists || !userStarted || backingUp) {
return false; return false;
} }
@@ -2265,15 +2266,17 @@ public class JobSchedulerService extends com.android.server.SystemService
final boolean jobExists = mJobs.containsJob(job); final boolean jobExists = mJobs.containsJob(job);
final boolean userStarted = areUsersStartedLocked(job); final boolean userStarted = areUsersStartedLocked(job);
final boolean backingUp = mBackingUpUids.indexOfKey(job.getSourceUid()) >= 0;
if (DEBUG) { if (DEBUG) {
Slog.v(TAG, "areComponentsInPlaceLocked: " + job.toShortString() 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 // These are also fairly cheap to check, though they typically will not
// be conditions we fail. // be conditions we fail.
if (!jobExists || !userStarted) { if (!jobExists || !userStarted || backingUp) {
return false; return false;
} }