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

Merge "Make PCC indication logic consistent between HIDL and AIDL"

Browse Source
This commit is contained in:
Treehugger Robot
2022-05-12 16:19:08 +00:00
committed by Gerrit Code Review
parent 49abc6feca 240bd841cb
commit e07281f079
1 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
telephony/java/android/telephony/PhysicalChannelConfig.java
View File

@@ -23,16 +23,12 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.telephony.Annotation.NetworkType; import android.telephony.Annotation.NetworkType;
import com.android.telephony.Rlog;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
public final class PhysicalChannelConfig implements Parcelable { public final class PhysicalChannelConfig implements Parcelable {
static final String TAG = "PhysicalChannelConfig";
// TODO(b/72993578) consolidate these enums in a central location. // TODO(b/72993578) consolidate these enums in a central location.
/** @hide */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@@ -571,21 +567,19 @@ public final class PhysicalChannelConfig implements Parcelable {
public @NonNull Builder setNetworkType(@NetworkType int networkType) { public @NonNull Builder setNetworkType(@NetworkType int networkType) {
if (!TelephonyManager.isNetworkTypeValid(networkType)) { if (!TelephonyManager.isNetworkTypeValid(networkType)) {
Rlog.e(TAG, "Builder.setNetworkType: Network type " + networkType + " is invalid."); throw new IllegalArgumentException("Network type " + networkType + " is invalid.");
} else {
mNetworkType = networkType;
} }
mNetworkType = networkType;
return this; return this;
} }
public @NonNull Builder setFrequencyRange(int frequencyRange) { public @NonNull Builder setFrequencyRange(int frequencyRange) {
if (!ServiceState.isFrequencyRangeValid(frequencyRange) if (!ServiceState.isFrequencyRangeValid(frequencyRange)
&& frequencyRange != ServiceState.FREQUENCY_RANGE_UNKNOWN) { && frequencyRange != ServiceState.FREQUENCY_RANGE_UNKNOWN) {
Rlog.e(TAG, "Builder.setFrequencyRange: Frequency range " + frequencyRange throw new IllegalArgumentException("Frequency range " + frequencyRange
+ " is invalid."); + " is invalid.");
} else {
mFrequencyRange = frequencyRange;
} }
mFrequencyRange = frequencyRange;
return this; return this;
} }
@@ -601,21 +595,19 @@ public final class PhysicalChannelConfig implements Parcelable {
public @NonNull Builder setCellBandwidthDownlinkKhz(int cellBandwidthDownlinkKhz) { public @NonNull Builder setCellBandwidthDownlinkKhz(int cellBandwidthDownlinkKhz) {
if (cellBandwidthDownlinkKhz < CELL_BANDWIDTH_UNKNOWN) { if (cellBandwidthDownlinkKhz < CELL_BANDWIDTH_UNKNOWN) {
Rlog.e(TAG, "Builder.setCellBandwidthDownlinkKhz: Cell downlink bandwidth(kHz) " throw new IllegalArgumentException("Cell downlink bandwidth(kHz) "
+ cellBandwidthDownlinkKhz + " is invalid."); + cellBandwidthDownlinkKhz + " is invalid.");
} else {
mCellBandwidthDownlinkKhz = cellBandwidthDownlinkKhz;
} }
mCellBandwidthDownlinkKhz = cellBandwidthDownlinkKhz;
return this; return this;
} }
public @NonNull Builder setCellBandwidthUplinkKhz(int cellBandwidthUplinkKhz) { public @NonNull Builder setCellBandwidthUplinkKhz(int cellBandwidthUplinkKhz) {
if (cellBandwidthUplinkKhz < CELL_BANDWIDTH_UNKNOWN) { if (cellBandwidthUplinkKhz < CELL_BANDWIDTH_UNKNOWN) {
Rlog.e(TAG, "Builder.setCellBandwidthUplinkKhz: Cell uplink bandwidth(kHz) " throw new IllegalArgumentException("Cell uplink bandwidth(kHz) "
+ cellBandwidthUplinkKhz + " is invalid."); + cellBandwidthUplinkKhz + " is invalid.");
} else {
mCellBandwidthUplinkKhz = cellBandwidthUplinkKhz;
} }
mCellBandwidthUplinkKhz = cellBandwidthUplinkKhz;
return this; return this;
} }
@@ -632,20 +624,18 @@ public final class PhysicalChannelConfig implements Parcelable {
public @NonNull Builder setPhysicalCellId(int physicalCellId) { public @NonNull Builder setPhysicalCellId(int physicalCellId) {
if (physicalCellId > PHYSICAL_CELL_ID_MAXIMUM_VALUE) { if (physicalCellId > PHYSICAL_CELL_ID_MAXIMUM_VALUE) {
Rlog.e(TAG, "Builder.setPhysicalCellId: Physical cell ID " + physicalCellId throw new IllegalArgumentException("Physical cell ID " + physicalCellId
+ " is over limit."); + " is over limit.");
} else {
mPhysicalCellId = physicalCellId;
} }
mPhysicalCellId = physicalCellId;
return this; return this;
} }
public @NonNull Builder setBand(int band) { public @NonNull Builder setBand(int band) {
if (band <= BAND_UNKNOWN) { if (band <= BAND_UNKNOWN) {
Rlog.e(TAG, "Builder.setBand: Band " + band + " is invalid."); throw new IllegalArgumentException("Band " + band + " is invalid.");
} else {
mBand = band;
} }
mBand = band;
return this; return this;
} }
} }