From 788708ce0a5e5f2c50962ddd1d05352c974d61cd Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Fri, 16 Sep 2022 20:07:58 +0000
Subject: [PATCH] Use common Comparator.

Every AlarmPriorityQueue will use the exact same comparator, so there's
no point creating a new one for each instance.

Bug: 247097209
Test: atest FrameworksMockingServicesTests:AlarmQueueTest
Change-Id: I8e07157fef57f6047414e9c8b46da0dac91c6714
---
 services/core/java/com/android/server/utils/AlarmQueue.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/utils/AlarmQueue.java b/services/core/java/com/android/server/utils/AlarmQueue.java
index 41373cd6bbe6b..09ba19508476e 100644
--- a/services/core/java/com/android/server/utils/AlarmQueue.java
+++ b/services/core/java/com/android/server/utils/AlarmQueue.java
@@ -64,8 +64,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, Comparator.comparingLong(o -> o.second));
+            super(1, sTimeComparator);
         }
 
         /**