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

Merge "Remove unnecessary +1ms to quota window calculation." into rvc-dev am: cbe9c27876 am: 63a9cea3a4 am: f657c69fcd

Browse Source 
Change-Id: I74ea2a08314565f7264bc52f2ddfbc752ac3df2c
This commit is contained in:
TreeHugger Robot
2020-03-24 19:34:56 +00:00
committed by Automerger Merge Worker
parent 1a04b82f4f f657c69fcd
commit aa2a3fd178
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1876,7 +1876,7 @@ class AlarmManagerService extends SystemService {
// package was t(q) then the next delivery must be after t(q) + <window_size> // package was t(q) then the next delivery must be after t(q) + <window_size>
final long t = mAppWakeupHistory.getNthLastWakeupForPackage( final long t = mAppWakeupHistory.getNthLastWakeupForPackage(
sourcePackage, sourceUserId, quotaForBucket); sourcePackage, sourceUserId, quotaForBucket);
minElapsed = t + 1 + mConstants.APP_STANDBY_WINDOW; minElapsed = t + mConstants.APP_STANDBY_WINDOW;
} }
if (alarm.expectedWhenElapsed < minElapsed) { if (alarm.expectedWhenElapsed < minElapsed) {
alarm.whenElapsed = alarm.maxWhenElapsed = minElapsed; alarm.whenElapsed = alarm.maxWhenElapsed = minElapsed;

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

@@ -496,7 +496,7 @@ public class AlarmManagerServiceTest {
// This one should get deferred on set // This one should get deferred on set
setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + quota, setTestAlarm(ELAPSED_REALTIME_WAKEUP, firstTrigger + quota,
getNewMockPendingIntent()); getNewMockPendingIntent());
final long expectedNextTrigger = firstTrigger + 1 + mAppStandbyWindow; final long expectedNextTrigger = firstTrigger + mAppStandbyWindow;
assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed()); assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed());
} }
@@ -516,7 +516,7 @@ public class AlarmManagerServiceTest {
mNowElapsedTest = mTestTimer.getElapsed(); mNowElapsedTest = mTestTimer.getElapsed();
mTestTimer.expire(); mTestTimer.expire();
} }
final long expectedNextTrigger = firstTrigger + 1 + mAppStandbyWindow; final long expectedNextTrigger = firstTrigger + mAppStandbyWindow;
assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed()); assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed());
} }
@@ -676,7 +676,7 @@ public class AlarmManagerServiceTest {
final int rareQuota = mService.getQuotaForBucketLocked(STANDBY_BUCKET_RARE); final int rareQuota = mService.getQuotaForBucketLocked(STANDBY_BUCKET_RARE);
// The last alarm should now be deferred. // The last alarm should now be deferred.
final long expectedNextTrigger = (firstTrigger + workingQuota - 1 - rareQuota) final long expectedNextTrigger = (firstTrigger + workingQuota - 1 - rareQuota)
+ mAppStandbyWindow + 1; + mAppStandbyWindow;
assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed()); assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed());
} }
@@ -695,7 +695,7 @@ public class AlarmManagerServiceTest {
} }
} }
// The last alarm should be deferred due to exceeding the quota // The last alarm should be deferred due to exceeding the quota
final long deferredTrigger = firstTrigger + 1 + mAppStandbyWindow; final long deferredTrigger = firstTrigger + mAppStandbyWindow;
assertEquals(deferredTrigger, mTestTimer.getElapsed()); assertEquals(deferredTrigger, mTestTimer.getElapsed());
// Upgrading the bucket now // Upgrading the bucket now
@@ -730,7 +730,7 @@ public class AlarmManagerServiceTest {
mTestTimer.expire(); mTestTimer.expire();
} }
// Any subsequent alarms in queue should all be deferred // Any subsequent alarms in queue should all be deferred
assertEquals(firstTrigger + mAppStandbyWindow + 1, mTestTimer.getElapsed()); assertEquals(firstTrigger + mAppStandbyWindow, mTestTimer.getElapsed());
// Paroling now // Paroling now
assertAndHandleParoleChanged(true); assertAndHandleParoleChanged(true);
@@ -744,7 +744,7 @@ public class AlarmManagerServiceTest {
assertAndHandleParoleChanged(false); assertAndHandleParoleChanged(false);
// Subsequent alarms should again get deferred // Subsequent alarms should again get deferred
final long expectedNextTrigger = (firstTrigger + 5) + 1 + mAppStandbyWindow; final long expectedNextTrigger = (firstTrigger + 5) + mAppStandbyWindow;
assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed()); assertEquals("Incorrect next alarm trigger", expectedNextTrigger, mTestTimer.getElapsed());
} }