Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ada04faf authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Make PCC indication logic consistent between HIDL and AIDL" into tm-dev... 

Merge "Make PCC indication logic consistent between HIDL and AIDL" into tm-dev am: 093e5392 am: cc2d111d

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



Change-Id: I956569cf1c4d465d6d76c1462cbbba8f2f2e2ed7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e8a6da67 cc2d111d

telephony/java/android/telephony/PhysicalChannelConfig.java

+12 −22
Original line number Diff line number Diff line
@@ -23,16 +23,12 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.telephony.Annotation.NetworkType;



import com.android.telephony.Rlog;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Arrays;

import java.util.Objects;



public final class PhysicalChannelConfig implements Parcelable {

    static final String TAG = "PhysicalChannelConfig";



    // TODO(b/72993578) consolidate these enums in a central location.

    /** @hide */

    @Retention(RetentionPolicy.SOURCE)
@@ -571,21 +567,19 @@ public final class PhysicalChannelConfig implements Parcelable { 


        public @NonNull Builder setNetworkType(@NetworkType int networkType) {

            if (!TelephonyManager.isNetworkTypeValid(networkType)) {

                Rlog.e(TAG, "Builder.setNetworkType: Network type " + networkType + " is invalid.");

            } else {

                mNetworkType = networkType;

                throw new IllegalArgumentException("Network type " + networkType + " is invalid.");

            }

            mNetworkType = networkType;

            return this;

        }



        public @NonNull Builder setFrequencyRange(int frequencyRange) {

            if (!ServiceState.isFrequencyRangeValid(frequencyRange)

                    && frequencyRange != ServiceState.FREQUENCY_RANGE_UNKNOWN) {

                Rlog.e(TAG, "Builder.setFrequencyRange: Frequency range " + frequencyRange

                throw new IllegalArgumentException("Frequency range " + frequencyRange

                        + " is invalid.");

            } else {

                mFrequencyRange = frequencyRange;

            }

            mFrequencyRange = frequencyRange;

            return this;

        }
@@ -601,21 +595,19 @@ public final class PhysicalChannelConfig implements Parcelable { 


        public @NonNull Builder setCellBandwidthDownlinkKhz(int cellBandwidthDownlinkKhz) {

            if (cellBandwidthDownlinkKhz < CELL_BANDWIDTH_UNKNOWN) {

                Rlog.e(TAG, "Builder.setCellBandwidthDownlinkKhz: Cell downlink bandwidth(kHz) "

                throw new IllegalArgumentException("Cell downlink bandwidth(kHz) "

                        + cellBandwidthDownlinkKhz + " is invalid.");

            } else {

                mCellBandwidthDownlinkKhz = cellBandwidthDownlinkKhz;

            }

            mCellBandwidthDownlinkKhz = cellBandwidthDownlinkKhz;

            return this;

        }



        public @NonNull Builder setCellBandwidthUplinkKhz(int cellBandwidthUplinkKhz) {

            if (cellBandwidthUplinkKhz < CELL_BANDWIDTH_UNKNOWN) {

                Rlog.e(TAG, "Builder.setCellBandwidthUplinkKhz: Cell uplink bandwidth(kHz) "

                throw new IllegalArgumentException("Cell uplink bandwidth(kHz) "

                        + cellBandwidthUplinkKhz + " is invalid.");

            } else {

                mCellBandwidthUplinkKhz = cellBandwidthUplinkKhz;

            }

            mCellBandwidthUplinkKhz = cellBandwidthUplinkKhz;

            return this;

        }
@@ -632,20 +624,18 @@ public final class PhysicalChannelConfig implements Parcelable { 


        public @NonNull Builder setPhysicalCellId(int physicalCellId) {

            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.");

            } else {

                mPhysicalCellId = physicalCellId;

            }

            mPhysicalCellId = physicalCellId;

            return this;

        }



        public @NonNull Builder setBand(int band) {

            if (band <= BAND_UNKNOWN) {

                Rlog.e(TAG, "Builder.setBand: Band " + band + " is invalid.");

            } else {

                mBand = band;

                throw new IllegalArgumentException("Band " + band + " is invalid.");

            }

            mBand = band;

            return this;

        }

    }