Merge "Fix BoxedPrimitiveEquality errorprone issue" into main

1 files changed, 2 insertions, 1 deletions

diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverMetrics.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverMetrics.java
index 42f49df63..411bcbc1d 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverMetrics.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverMetrics.java
@@ -388,7 +388,8 @@ public class CellBroadcastReceiverMetrics {
             throws IOException {
         Cellbroadcastmetric.CellBroadcastChannelRangesProto.Builder rangeListBuilder =
                 Cellbroadcastmetric.CellBroadcastChannelRangesProto.newBuilder();
-        rangeList.stream().sorted((o1, o2) -> o1.first == o2.first ? o1.second - o2.second
+        rangeList.stream().sorted((o1, o2) -> Objects.equals(o1.first, o2.first)
+                ? o1.second - o2.second
                 : o1.first - o2.first).forEach(pair -> {
             Cellbroadcastmetric.CellBroadcastChannelRangeProto.Builder rangeBuilder =
                     Cellbroadcastmetric.CellBroadcastChannelRangeProto.newBuilder();