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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-16 19:34:57 +00:00
committed by Android (Google) Code Review
parent 56cd4dcad5 18c5870551
commit 2b80990bbc
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 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;
}