From 2cd3086c69dbc17a86b340cb7376ba6f2c3181cb Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Mon, 11 Jul 2022 15:39:54 -0700 Subject: [PATCH] Remove unnecessary frequency range compare API Compare ranges directly Test: atest NetworkTypeControllerTest Bug: 233048459 Change-Id: Iad85437bb0d289f4f3c44e1a0642c780d55edcdb --- .../java/android/telephony/ServiceState.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index bfa60ba960ca0..6be2f770efe98 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -138,13 +138,6 @@ public class ServiceState implements Parcelable { */ public static final int FREQUENCY_RANGE_MMWAVE = 4; - private static final List 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_", @@ -2107,15 +2100,6 @@ public class ServiceState implements Parcelable { } } - /** - * @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