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

Commit 8be77a14 authored by Kweku Adams's avatar Kweku Adams
Browse files

Fix long comparison overflow issue in AlarmQueue. 

Bug: 247097209
Test: atest FrameworksMockingServicesTests:AlarmQueueTest
Change-Id: Ib3fd31ca7dc37c18499052d8d4f03814568c11c2
Merged-In: I8e07157fef57f6047414e9c8b46da0dac91c6714
parent dea70726

services/core/java/com/android/server/utils/AlarmQueue.java

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.util.Slog; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;



import java.util.Comparator;

import java.util.PriorityQueue;

import java.util.function.Predicate;
@@ -58,8 +59,11 @@ public abstract class AlarmQueue<K> implements AlarmManager.OnAlarmListener { 
     * The pair is the key and its associated alarm time (in the elapsed realtime timebase).

     */

    private static class AlarmPriorityQueue<Q> extends PriorityQueue<Pair<Q, Long>> {

        private static final Comparator<Pair<?, Long>> sTimeComparator =

                (o1, o2) -> Long.compare(o1.second, o2.second);



        AlarmPriorityQueue() {

            super(1, (o1, o2) -> (int) (o1.second - o2.second));

            super(1, sTimeComparator);

        }



        /**

services/tests/mockingservicestests/src/com/android/server/utils/AlarmQueueTest.java

+21 −0
Original line number Diff line number Diff line
@@ -155,6 +155,27 @@ public class AlarmQueueTest { 
                anyInt(), eq(nowElapsed + HOUR_IN_MILLIS), eq(ALARM_TAG), any(), any());

    }



    @Test

    public void testAddingLargeAlarmTimes() {

        final AlarmQueue<String> alarmQueue = createAlarmQueue(true, 0);

        final long nowElapsed = mInjector.getElapsedRealtime();



        InOrder inOrder = inOrder(mAlarmManager);



        alarmQueue.addAlarm("com.android.test.1", Long.MAX_VALUE - 5);

        inOrder.verify(mAlarmManager, timeout(1000).times(1))

                .setExact(anyInt(), eq(Long.MAX_VALUE - 5), eq(ALARM_TAG), any(), any());

        alarmQueue.addAlarm("com.android.test.2", Long.MAX_VALUE - 4);

        inOrder.verify(mAlarmManager, never())

                .setExact(anyInt(), anyLong(), eq(ALARM_TAG), any(), any());

        alarmQueue.addAlarm("com.android.test.3", nowElapsed + 5);

        inOrder.verify(mAlarmManager, timeout(1000).times(1))

                .setExact(anyInt(), eq(nowElapsed + 5), eq(ALARM_TAG), any(), any());

        alarmQueue.addAlarm("com.android.test.4", nowElapsed + 6);

        inOrder.verify(mAlarmManager, never())

                .setExact(anyInt(), anyLong(), eq(ALARM_TAG), any(), any());

    }



    /**

     * Verify that updating the alarm time for a key will result in the AlarmManager alarm changing,

     * if needed.