Merge "Rename JobStatus.shouldTreatAsUserInitiated for consistency." (eda6de13) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1114,7 +1114,7 @@ class JobConcurrencyManager {
		// reasonably concurrency behavior.
		return job.lastEvaluatedBias == JobInfo.BIAS_TOP_APP
		// TODO(): include BAL state for user-initiated jobs
		&& (job.shouldTreatAsExpeditedJob() \|\| job.shouldTreatAsUserInitiated());
		&& (job.shouldTreatAsExpeditedJob() \|\| job.shouldTreatAsUserInitiatedJob());
		}

		@GuardedBy("mLock")

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -2851,7 +2851,7 @@ public class JobSchedulerService extends com.android.server.SystemService
		}

		final boolean shouldForceBatchJob;
		if (job.shouldTreatAsExpeditedJob() \|\| job.shouldTreatAsUserInitiated()) {
		if (job.shouldTreatAsExpeditedJob() \|\| job.shouldTreatAsUserInitiatedJob()) {
		// Never batch expedited or user-initiated jobs, even for RESTRICTED apps.
		shouldForceBatchJob = false;
		} else if (job.getEffectiveStandbyBucket() == RESTRICTED_INDEX) {
		@@ -3176,7 +3176,7 @@ public class JobSchedulerService extends com.android.server.SystemService
		synchronized (mLock) {
		final boolean shouldTreatAsDataTransfer = job.getJob().isDataTransfer()
		&& checkRunLongJobsPermission(job.getSourceUid(), job.getSourcePackageName());
		if (job.shouldTreatAsUserInitiated()) {
		if (job.shouldTreatAsUserInitiatedJob()) {
		if (shouldTreatAsDataTransfer) {
		final long estimatedTransferTimeMs =
		mConnectivityController.getEstimatedTransferTimeMs(job);
		@@ -3215,13 +3215,13 @@ public class JobSchedulerService extends com.android.server.SystemService
		synchronized (mLock) {
		final boolean allowLongerJob;
		final boolean isDataTransfer = job.getJob().isDataTransfer();
		if (isDataTransfer \|\| job.shouldTreatAsUserInitiated()) {
		if (isDataTransfer \|\| job.shouldTreatAsUserInitiatedJob()) {
		allowLongerJob =
		checkRunLongJobsPermission(job.getSourceUid(), job.getSourcePackageName());
		} else {
		allowLongerJob = false;
		}
		if (job.shouldTreatAsUserInitiated()) {
		if (job.shouldTreatAsUserInitiatedJob()) {
		if (isDataTransfer && allowLongerJob) {
		return mConstants.RUNTIME_USER_INITIATED_DATA_TRANSFER_LIMIT_MS;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -307,7 +307,7 @@ public final class JobServiceContext implements ServiceConnection {
		mParams = new JobParameters(mRunningCallback, job.getJobId(), ji.getExtras(),
		ji.getTransientExtras(), ji.getClipData(), ji.getClipGrantFlags(),
		isDeadlineExpired, job.shouldTreatAsExpeditedJob(),
		job.shouldTreatAsUserInitiated(), triggeredUris, triggeredAuthorities,
		job.shouldTreatAsUserInitiatedJob(), triggeredUris, triggeredAuthorities,
		job.network);
		mExecutionStartTimeElapsed = sElapsedRealtimeClock.millis();
		mMinExecutionGuaranteeMillis = mService.getMinJobExecutionGuaranteeMs(job);

apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ public final class ConnectivityController extends RestrictingController implemen
		final UidStats uidStats =
		getUidStats(jobStatus.getSourceUid(), jobStatus.getSourcePackageName(), true);

		if (jobStatus.shouldTreatAsExpeditedJob() && jobStatus.shouldTreatAsUserInitiated()) {
		if (jobStatus.shouldTreatAsExpeditedJob() && jobStatus.shouldTreatAsUserInitiatedJob()) {
		if (!jobStatus.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY)) {
		// Don't request a direct hole through any of the firewalls. Instead, mark the
		// constraint as satisfied if the network is available, and the job will get
		@@ -971,14 +971,14 @@ public final class ConnectivityController extends RestrictingController implemen
		if (job.shouldTreatAsExpeditedJob() \|\| job.startedAsExpeditedJob) {
		us.earliestEJEnqueueTime =
		Math.min(us.earliestEJEnqueueTime, job.enqueueTime);
		} else if (job.shouldTreatAsUserInitiated()) {
		} else if (job.shouldTreatAsUserInitiatedJob()) {
		us.earliestUIJEnqueueTime =
		Math.min(us.earliestUIJEnqueueTime, job.enqueueTime);
		}
		}
		if (job.shouldTreatAsExpeditedJob() \|\| job.startedAsExpeditedJob) {
		us.numEJs++;
		} else if (job.shouldTreatAsUserInitiated()) {
		} else if (job.shouldTreatAsUserInitiatedJob()) {
		us.numUIJs++;
		} else {
		us.numRegular++;

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -1350,9 +1350,8 @@ public final class JobStatus {
		* @return true if the job was scheduled as a user-initiated job and it hasn't been downgraded
		* for any reason.
		*/
		public boolean shouldTreatAsUserInitiated() {
		public boolean shouldTreatAsUserInitiatedJob() {
		// TODO(248386641): update implementation to handle loss of privilege
		// and also rename to `shouldTreatAsUserInitiatedJob` for consistency
		return getJob().isUserInitiated();
		}

		@@ -1372,7 +1371,7 @@ public final class JobStatus {
		* @return true if this is a job whose execution should be made visible to the user.
		*/
		public boolean isUserVisibleJob() {
		return shouldTreatAsUserInitiated();
		return shouldTreatAsUserInitiatedJob();
		}

		/**
		@@ -1383,14 +1382,14 @@ public final class JobStatus {
		return appHasDozeExemption
		\|\| (getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) != 0
		\|\| ((shouldTreatAsExpeditedJob() \|\| startedAsExpeditedJob)
		\|\| shouldTreatAsUserInitiated()
		\|\| shouldTreatAsUserInitiatedJob()
		&& (mDynamicConstraints & CONSTRAINT_DEVICE_NOT_DOZING) == 0);
		}

		boolean canRunInBatterySaver() {
		return (getInternalFlags() & INTERNAL_FLAG_HAS_FOREGROUND_EXEMPTION) != 0
		\|\| ((shouldTreatAsExpeditedJob() \|\| startedAsExpeditedJob)
		\|\| shouldTreatAsUserInitiated()
		\|\| shouldTreatAsUserInitiatedJob()
		&& (mDynamicConstraints & CONSTRAINT_BACKGROUND_NOT_RESTRICTED) == 0);
		}