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

Change-Id: I37f72a913a296a17a33770c3cd94d95bd3c44c03
This commit is contained in:
TreeHugger Robot
2020-04-17 07:26:43 +00:00
committed by Automerger Merge Worker

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;