Merge "Fix pending queue job presence check." into tm-dev (cd1c3ede) · Commits · e / os / android_frameworks_base

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

services/tests/servicestests/src/com/android/server/job/PendingJobQueueTest.java

+164 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server.job;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertNotNull;
		import static org.junit.Assert.assertNull;
		import static org.junit.Assert.assertTrue;
		@@ -25,6 +26,7 @@ import static org.junit.Assert.fail;
		import android.app.job.JobInfo;
		import android.content.ComponentName;
		import android.platform.test.annotations.LargeTest;
		import android.util.ArraySet;
		import android.util.Log;
		import android.util.SparseArray;
		import android.util.SparseBooleanArray;
		@@ -117,6 +119,56 @@ public class PendingJobQueueTest {
		assertNull(jobQueue.next());
		}

		@Test
		public void testContains() {
		JobStatus joba1 = createJobStatus("testRemove", createJobInfo(1), 1);
		JobStatus joba2 = createJobStatus("testRemove", createJobInfo(2), 1);
		JobStatus jobb1 = createJobStatus("testRemove", createJobInfo(3).setExpedited(true), 2);
		JobStatus jobb2 = createJobStatus("testRemove",
		createJobInfo(4).setPriority(JobInfo.PRIORITY_MIN), 2);

		// Make joba1 and joba2 sort-equivalent
		joba1.enqueueTime = 3;
		joba2.enqueueTime = 3;
		jobb1.enqueueTime = 4;
		jobb2.enqueueTime = 1;

		PendingJobQueue jobQueue = new PendingJobQueue();

		assertFalse(jobQueue.contains(joba1));
		assertFalse(jobQueue.contains(joba2));
		assertFalse(jobQueue.contains(jobb1));
		assertFalse(jobQueue.contains(jobb2));

		jobQueue.add(joba1);

		assertTrue(jobQueue.contains(joba1));
		assertFalse(jobQueue.contains(joba2));
		assertFalse(jobQueue.contains(jobb1));
		assertFalse(jobQueue.contains(jobb2));

		jobQueue.add(jobb1);

		assertTrue(jobQueue.contains(joba1));
		assertFalse(jobQueue.contains(joba2));
		assertTrue(jobQueue.contains(jobb1));
		assertFalse(jobQueue.contains(jobb2));

		jobQueue.add(jobb2);

		assertTrue(jobQueue.contains(joba1));
		assertFalse(jobQueue.contains(joba2));
		assertTrue(jobQueue.contains(jobb1));
		assertTrue(jobQueue.contains(jobb2));

		jobQueue.add(joba2);

		assertTrue(jobQueue.contains(joba1));
		assertTrue(jobQueue.contains(joba2));
		assertTrue(jobQueue.contains(jobb1));
		assertTrue(jobQueue.contains(jobb2));
		}

		@Test
		public void testRemove() {
		List<JobStatus> jobs = new ArrayList<>();
		@@ -129,9 +181,120 @@ public class PendingJobQueueTest {
		PendingJobQueue jobQueue = new PendingJobQueue();
		jobQueue.addAll(jobs);

		ArraySet<JobStatus> removed = new ArraySet<>();
		JobStatus job;
		for (int i = 0; i < jobs.size(); ++i) {
		jobQueue.remove(jobs.get(i));
		removed.add(jobs.get(i));

		assertEquals(jobs.size() - i - 1, jobQueue.size());

		jobQueue.resetIterator();
		while ((job = jobQueue.next()) != null) {
		assertFalse("Queue retained a removed job " + testJobToString(job),
		removed.contains(job));
		}
		}
		assertNull(jobQueue.next());
		}

		@Test
		public void testRemove_outOfOrder() {
		List<JobStatus> jobs = new ArrayList<>();
		JobStatus job1 = createJobStatus("testRemove", createJobInfo(1), 1);
		JobStatus job2 = createJobStatus("testRemove", createJobInfo(2), 1);
		JobStatus job3 = createJobStatus("testRemove", createJobInfo(3).setExpedited(true), 1);
		JobStatus job4 = createJobStatus("testRemove",
		createJobInfo(4).setPriority(JobInfo.PRIORITY_MIN), 1);
		JobStatus job5 = createJobStatus("testRemove", createJobInfo(5).setExpedited(true), 1);

		// Enqueue order (by ID): 4, 5, 3, {1,2 -- at the same time}
		job1.enqueueTime = 3;
		job2.enqueueTime = 3;
		job3.enqueueTime = 4;
		job4.enqueueTime = 1;
		job5.enqueueTime = 2;

		// 1 & 2 have the same enqueue time (could happen at boot), so ordering won't be consistent
		// between the two
		// Result job order should be (by ID): 5, 3, {1,2}, {1,2}, 4

		// Intended removal order (by ID): 5, 3, 2, 1, 4
		jobs.add(job5);
		jobs.add(job3);
		jobs.add(job2);
		jobs.add(job1);
		jobs.add(job4);

		PendingJobQueue jobQueue = new PendingJobQueue();
		jobQueue.addAll(jobs);

		ArraySet<JobStatus> removed = new ArraySet<>();
		JobStatus job;
		while ((job = jobQueue.next()) != null) {
		Log.d(TAG, testJobToString(job));
		}
		for (int i = 0; i < jobs.size(); ++i) {
		jobQueue.remove(jobs.get(i));
		removed.add(jobs.get(i));

		assertEquals(jobs.size() - i - 1, jobQueue.size());

		jobQueue.resetIterator();
		while ((job = jobQueue.next()) != null) {
		assertFalse("Queue retained a removed job " + testJobToString(job),
		removed.contains(job));
		}
		}
		assertNull(jobQueue.next());

		// Intended removal order (by ID): 3, 1, 2, 5, 4
		jobs.clear();
		jobs.add(job3);
		jobs.add(job1);
		jobs.add(job5);
		jobs.add(job2);
		jobs.add(job4);

		jobQueue.addAll(jobs);

		removed.clear();
		for (int i = 0; i < jobs.size(); ++i) {
		jobQueue.remove(jobs.get(i));
		removed.add(jobs.get(i));

		assertEquals(jobs.size() - i - 1, jobQueue.size());

		jobQueue.resetIterator();
		while ((job = jobQueue.next()) != null) {
		assertFalse("Queue retained a removed job " + testJobToString(job),
		removed.contains(job));
		}
		}
		assertNull(jobQueue.next());

		// Intended removal order (by ID): 3, 2, 1, 4, 5
		jobs.clear();
		jobs.add(job3);
		jobs.add(job2);
		jobs.add(job1);
		jobs.add(job4);
		jobs.add(job5);

		jobQueue.addAll(jobs);

		removed.clear();
		for (int i = 0; i < jobs.size(); ++i) {
		jobQueue.remove(jobs.get(i));
		removed.add(jobs.get(i));

		assertEquals(jobs.size() - i - 1, jobQueue.size());

		jobQueue.resetIterator();
		while ((job = jobQueue.next()) != null) {
		assertFalse("Queue retained a removed job " + testJobToString(job),
		removed.contains(job));
		}
		}
		assertNull(jobQueue.next());
		}