Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-10 20:24:22 +00:00
committed by Android (Google) Code Review
parent 78248336bb 951fa94b6a
commit 9d451d5576
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/AlarmManagerService.java
View File

@@ -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");

43
services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java
View File

@@ -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) {