Merge "Add FrequencyRange comparator to ServiceState" am: d0c404cb21 (b527f8a4) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,13 @@ public class ServiceState implements Parcelable {
		*/
		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_",
		@@ -1835,4 +1842,13 @@ public class ServiceState implements Parcelable {
		mNetworkRegistrationStates.add(regState);
		}
		}

		/**
		* @hide
		*/
		public static final int getBetterNRFrequencyRange(int range1, int range2) {
		return FREQUENCY_RANGE_ORDER.indexOf(range1) > FREQUENCY_RANGE_ORDER.indexOf(range2)
		? range1
		: range2;
		}
		}