Snap for 8432030 from 562284d467edb294f9abf09337c455fb0b8e46bd to tm-qpr1-release (75b868d1) · Commits · e / os / android_frameworks_base

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1208,7 +1208,7 @@ class JobConcurrencyManager {
		}
		if (highestBiasJob != null) {
		if (DEBUG) {
		Slog.d(TAG, "Running job " + jobStatus + " as preemption");
		Slog.d(TAG, "Running job " + highestBiasJob + " as preemption");
		}
		mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes);
		startJobLocked(worker, highestBiasJob, highBiasWorkType);
		@@ -1219,7 +1219,7 @@ class JobConcurrencyManager {
		worker.clearPreferredUid();
		if (backupJob != null) {
		if (DEBUG) {
		Slog.d(TAG, "Running job " + jobStatus + " instead");
		Slog.d(TAG, "Running job " + backupJob + " instead");
		}
		mWorkCountTracker.stageJob(backupWorkType, backupAllWorkTypes);
		startJobLocked(worker, backupJob, backupWorkType);
		@@ -1263,7 +1263,7 @@ class JobConcurrencyManager {
		// This slot is free, and we haven't yet hit the limit on
		// concurrent jobs... we can just throw the job in to here.
		if (DEBUG) {
		Slog.d(TAG, "About to run job: " + jobStatus);
		Slog.d(TAG, "About to run job: " + highestBiasJob);
		}
		mWorkCountTracker.stageJob(highBiasWorkType, highBiasAllWorkTypes);
		startJobLocked(worker, highestBiasJob, highBiasWorkType);

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

+7 −1

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

		// Remove from store as well as controllers.
		final boolean removed = mJobs.remove(jobStatus, removeFromPersisted);
		if (removed && mReadyToRock) {
		if (!removed) {
		// We never create JobStatus objects for the express purpose of removing them, and this
		// method is only ever called for jobs that were saved in the JobStore at some point,
		// so if we can't find it, something went seriously wrong.
		Slog.wtfStack(TAG, "Job didn't exist in JobStore");
		}
		if (mReadyToRock) {
		for (int i = 0; i < mControllers.size(); i++) {
		StateController controller = mControllers.get(i);
		controller.maybeStopTrackingJobLocked(jobStatus, incomingJob, false);

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -992,6 +992,10 @@ public final class JobServiceContext implements ServiceConnection {
		if (mVerb == VERB_FINISHED) {
		return;
		}
		if (DEBUG) {
		Slog.d(TAG, "Cleaning up " + mRunningJob.toShortString()
		+ " reschedule=" + reschedule + " reason=" + reason);
		}
		applyStoppedReasonLocked(reason);
		completedJob = mRunningJob;
		final int internalStopReason = mParams.getInternalStopReasonCode();

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

+13 −10

Original line number	Diff line number	Diff line
		@@ -261,6 +261,9 @@ class PendingJobQueue {
		}
		final JobStatus job1 = aj1.job;
		final JobStatus job2 = aj2.job;
		if (job1 == job2) {
		return 0;
		}
		// Jobs with an override state set (via adb) should be put first as tests/developers
		// expect the jobs to run immediately.
		if (job1.overrideState != job2.overrideState) {
		@@ -381,18 +384,18 @@ class PendingJobQueue {
		return indexOf(job) >= 0;
		}

		/** Returns the current index of the job, or -1 if the job isn't in the list. */
		private int indexOf(@NonNull JobStatus jobStatus) {
		AdjustedJobStatus adjustedJobStatus = mAdjustedJobStatusPool.acquire();
		if (adjustedJobStatus == null) {
		adjustedJobStatus = new AdjustedJobStatus();
		// Binary search can't guarantee returning the correct index
		// if there are multiple jobs whose sorting comparison are 0, so we need to iterate
		// through the entire list.
		for (int i = 0, size = mJobs.size(); i < size; ++i) {
		AdjustedJobStatus adjustedJobStatus = mJobs.get(i);
		if (adjustedJobStatus.job == jobStatus) {
		return i;
		}
		adjustedJobStatus.adjustedEnqueueTime = jobStatus.enqueueTime;
		adjustedJobStatus.job = jobStatus;

		int where = Collections.binarySearch(mJobs, adjustedJobStatus, sJobComparator);
		adjustedJobStatus.clear();
		mAdjustedJobStatusPool.release(adjustedJobStatus);
		return where;
		}
		return -1;
		}

		@Nullable

core/java/android/accessibilityservice/TouchInteractionController.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -262,7 +262,7 @@ public final class TouchInteractionController {
		* interaction.
		*/
		public void requestTouchExploration() {
		checkState();
		validateTransitionRequest();
		final IAccessibilityServiceConnection connection =
		AccessibilityInteractionClient.getInstance()
		.getConnection(mService.getConnectionId());
		@@ -288,7 +288,7 @@ public final class TouchInteractionController {
		* @throws IllegalArgumentException if the pointer id is outside of the allowed range.
		*/
		public void requestDragging(int pointerId) {
		checkState();
		validateTransitionRequest();
		if (pointerId < 0 \|\| pointerId > MAX_POINTER_COUNT) {
		throw new IllegalArgumentException("Invalid pointer id: " + pointerId);
		}
		@@ -313,7 +313,7 @@ public final class TouchInteractionController {
		* the duration of this interaction.
		*/
		public void requestDelegating() {
		checkState();
		validateTransitionRequest();
		final IAccessibilityServiceConnection connection =
		AccessibilityInteractionClient.getInstance()
		.getConnection(mService.getConnectionId());
		@@ -371,14 +371,14 @@ public final class TouchInteractionController {
		}
		}

		private void checkState() {
		private void validateTransitionRequest() {
		if (!mServiceDetectsGestures \|\| mCallbacks.size() == 0) {
		throw new IllegalStateException(
		"State transitions are not allowed without first adding a callback.");
		}
		if (mState != STATE_TOUCH_INTERACTING && mState != STATE_DRAGGING) {
		if ((mState == STATE_DELEGATING \|\| mState == STATE_TOUCH_EXPLORING)) {
		throw new IllegalStateException(
		"State transitions are not allowed in " + stateToString(mState));
		"State transition requests are not allowed in " + stateToString(mState));
		}
		}