Merge "Add FrequencyRange comparator to ServiceState"

am: d0c404cb21

Change-Id: I4b20c8a2d38a6f64530a281a3db9df18a593e845
This commit is contained in:
Pengquan Meng
2018-12-17 11:16:56 -08:00
committed by android-build-merger

View File

@@ -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;
}
}