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

Merge "Allow system processes to set near-future alarms" into rvc-dev am: 10451e55ed am: e6eaea20f3

Browse Source 
Change-Id: I0d9f908ad0309678d08b61baca36bdb11f2dc0a4
This commit is contained in:
TreeHugger Robot
2020-04-17 07:54:31 +00:00
committed by Automerger Merge Worker
parent f318706249 e6eaea20f3
commit 01f114bf73
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1741,8 +1741,9 @@ class AlarmManagerService extends SystemService {
final long nowElapsed = mInjector.getElapsedRealtime();
final long nominalTrigger = convertToElapsed(triggerAtTime, type);
// Try to prevent spamming by making sure we aren't firing alarms in the immediate future
final long minTrigger = nowElapsed + mConstants.MIN_FUTURITY;
// Try to prevent spamming by making sure apps aren't firing alarms in the immediate future
final long minTrigger = nowElapsed
+ (UserHandle.isCore(callingUid) ? 0L : mConstants.MIN_FUTURITY);
final long triggerElapsed = (nominalTrigger > minTrigger) ? nominalTrigger : minTrigger;
final long maxElapsed;