commit 2cd3086c69dbc17a86b340cb7376ba6f2c3181cb
author Sarah Chin <sarahchin@google.com> Mon Jul 11 15:39:54 2022 -0700
committer Sarah Chin <sarahchin@google.com> Wed Jul 13 04:15:31 2022 +0000
tree 27fb389c0dcb534124c4f5826048737bc64dfa19
parent 39dfa88607db72e1deefeb669e1ac88362fad0ac

Remove unnecessary frequency range compare API

Compare ranges directly

Test: atest NetworkTypeControllerTest
Bug: 233048459
Change-Id: Iad85437bb0d289f4f3c44e1a0642c780d55edcdb

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index bfa60ba..6be2f77 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -138,13 +138,6 @@
      */
     public static final int FREQUENCY_RANGE_MMWAVE = 4;
 
-    private static final List<Integer> FREQUENCY_RANGE_ORDER = Arrays.asList(
-            FREQUENCY_RANGE_UNKNOWN,
-            FREQUENCY_RANGE_LOW,
-            FREQUENCY_RANGE_MID,
-            FREQUENCY_RANGE_HIGH,
-            FREQUENCY_RANGE_MMWAVE);
-
     /** @hide */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(prefix = "DUPLEX_MODE_",
@@ -2108,15 +2101,6 @@
     }
 
     /**
-     * @hide
-     */
-    public static final int getBetterNRFrequencyRange(int range1, int range2) {
-        return FREQUENCY_RANGE_ORDER.indexOf(range1) > FREQUENCY_RANGE_ORDER.indexOf(range2)
-                ? range1
-                : range2;
-    }
-
-    /**
      * Returns a copy of self with location-identifying information removed.
      * Always clears the NetworkRegistrationInfo's CellIdentity fields, but if removeCoarseLocation
      * is true, clears other info as well.