Merge "[PhysicalChannelConfig] RIL will report UNKNOWN range to PhysicalChannelConfig and it can not throw out Exception." into sc-dev am: 20c5582b51 am: 215eee9a04

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425168

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe4c0762dd6b5adaf5b1a6e164afd5ac6a5ceca
This commit is contained in:
Zoey Chen
2021-01-29 21:04:23 +00:00
committed by Automerger Merge Worker

View File

@@ -554,7 +554,8 @@ public final class PhysicalChannelConfig implements Parcelable {
}
public @NonNull Builder setFrequencyRange(int frequencyRange) {
if (!ServiceState.isFrequencyRangeValid(frequencyRange)) {
if (!ServiceState.isFrequencyRangeValid(frequencyRange)
&& frequencyRange != ServiceState.FREQUENCY_RANGE_UNKNOWN) {
throw new IllegalArgumentException("Frequency range: " + frequencyRange +
" is invalid.");
}