Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0799d5be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I37f72a913a296a17a33770c3cd94d95bd3c44c03
parents 8a23b6df 10451e55

services/core/java/com/android/server/AlarmManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -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;