Merge "Don't run jobs in apps performing full-data backup" into rvc-dev am:... (9f88c97b) · Commits · e / os / android_frameworks_base

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;
		}