Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" (87a85276) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/AlarmManagerService.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -3109,6 +3109,14 @@ class AlarmManagerService extends SystemService {
		mPendingBackgroundAlarms.removeAt(i);
		}
		}
		for (int i = mPendingNonWakeupAlarms.size() - 1; i >= 0; i--) {
		final Alarm a = mPendingNonWakeupAlarms.get(i);
		if (a.matches(operation, directReceiver)) {
		// Don't set didRemove, since this doesn't impact the scheduled alarms.
		mPendingNonWakeupAlarms.remove(i);
		decrementAlarmCount(a.uid, 1);
		}
		}
		if (didRemove) {
		if (DEBUG_BATCH) {
		Slog.v(TAG, "remove(operation) changed bounds; rebatching");

services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java

+43 −0

Original line number	Diff line number	Diff line
		@@ -1053,6 +1053,49 @@ public class AlarmManagerServiceTest {
		}
		}

		@Test
		public void nonWakeupAlarmsDeferred() throws Exception {
		final int numAlarms = 10;
		final PendingIntent[] pis = new PendingIntent[numAlarms];
		for (int i = 0; i < numAlarms; i++) {
		pis[i] = getNewMockPendingIntent();
		setTestAlarm(ELAPSED_REALTIME, mNowElapsedTest + i + 5, pis[i]);
		}
		doReturn(true).when(mService).checkAllowNonWakeupDelayLocked(anyLong());
		// Advance time past all expirations.
		mNowElapsedTest += numAlarms + 5;
		mTestTimer.expire();
		assertEquals(numAlarms, mService.mPendingNonWakeupAlarms.size());

		// These alarms should be sent on interactive state change to true
		mService.interactiveStateChangedLocked(false);
		mService.interactiveStateChangedLocked(true);

		for (int i = 0; i < numAlarms; i++) {
		verify(pis[i]).send(eq(mMockContext), eq(0), any(Intent.class), any(),
		any(Handler.class), isNull(), any());
		}
		}

		@Test
		public void alarmCountOnPendingNonWakeupAlarmsRemoved() throws Exception {
		final int numAlarms = 10;
		final PendingIntent[] pis = new PendingIntent[numAlarms];
		for (int i = 0; i < numAlarms; i++) {
		pis[i] = getNewMockPendingIntent();
		setTestAlarm(ELAPSED_REALTIME, mNowElapsedTest + i + 5, pis[i]);
		}
		doReturn(true).when(mService).checkAllowNonWakeupDelayLocked(anyLong());
		// Advance time past all expirations.
		mNowElapsedTest += numAlarms + 5;
		mTestTimer.expire();
		assertEquals(numAlarms, mService.mPendingNonWakeupAlarms.size());
		for (int i = 0; i < numAlarms; i++) {
		mService.removeLocked(pis[i], null);
		assertEquals(numAlarms - i - 1, mService.mAlarmsPerUid.get(TEST_CALLING_UID, 0));
		}
		}

		@After
		public void tearDown() {
		if (mMockingSession != null) {