Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add FrequencyRange comparator to ServiceState" am: d0c404cb21

Browse Source 
am: 5cb84d7f23

Change-Id: I5550790e9db3604bf35d4f01b6e7fef316e3809e
This commit is contained in:
Pengquan Meng
2018-12-17 11:28:32 -08:00
committed by android-build-merger
parent fcd87384c4 5cb84d7f23
commit b527f8a44c
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
telephony/java/android/telephony/ServiceState.java
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;
}
}