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: 0799d5be8a am: 35eac56fa6

Browse Source 
Change-Id: I599c6008f3214350a67f2a9277bd171b3da7e70f
This commit is contained in:
TreeHugger Robot
2020-04-17 08:09:51 +00:00
committed by Automerger Merge Worker
parent 107d150c0b 35eac56fa6
commit aa6b6daaf6
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 nowElapsed = mInjector.getElapsedRealtime();
final long nominalTrigger = convertToElapsed(triggerAtTime, type); final long nominalTrigger = convertToElapsed(triggerAtTime, type);
// Try to prevent spamming by making sure we aren't firing alarms in the immediate future // Try to prevent spamming by making sure apps aren't firing alarms in the immediate future
final long minTrigger = nowElapsed + mConstants.MIN_FUTURITY; final long minTrigger = nowElapsed
+ (UserHandle.isCore(callingUid) ? 0L : mConstants.MIN_FUTURITY);
final long triggerElapsed = (nominalTrigger > minTrigger) ? nominalTrigger : minTrigger; final long triggerElapsed = (nominalTrigger > minTrigger) ? nominalTrigger : minTrigger;
final long maxElapsed; final long maxElapsed;