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

Commit ea9d0511 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Allow unknown mcc/mnc when constructing a CellIdentity from... 

Merge "Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am: 3df706dc am: ea01b02f am: 5c1b92c5"
parents f7b3a7e9 308e7ae6

telephony/java/android/telephony/CellIdentityGsm.java

+13 −6
Original line number Diff line number Diff line
@@ -115,22 +115,29 @@ public final class CellIdentityGsm implements Parcelable { 
        // for inbound parcels

        mBsic = (bsic == 0xFF) ? Integer.MAX_VALUE : bsic;



        // Only allow INT_MAX if unknown string mcc/mnc

        if (mccStr == null || mccStr.matches("^[0-9]{3}$")) {

            mMccStr = mccStr;

        } else if (mccStr.isEmpty()) {

            // If the mccStr parsed from Parcel is empty, set it as null.

        } else if (mccStr.isEmpty() || mccStr.equals(String.valueOf(Integer.MAX_VALUE))) {

            // If the mccStr is empty or unknown, set it as null.

            mMccStr = null;

        } else {

            throw new IllegalArgumentException("invalid MCC format");

            // TODO: b/69384059 Should throw IllegalArgumentException for the invalid MCC format

            // after the bug got fixed.

            mMccStr = null;

            log("invalid MCC format: " + mccStr);

        }



        if (mncStr == null || mncStr.matches("^[0-9]{2,3}$")) {

            mMncStr = mncStr;

        } else if (mncStr.isEmpty()) {

            // If the mncStr parsed from Parcel is empty, set it as null.

        } else if (mncStr.isEmpty() || mncStr.equals(String.valueOf(Integer.MAX_VALUE))) {

            // If the mncStr is empty or unknown, set it as null.

            mMncStr = null;

        } else {

            throw new IllegalArgumentException("invalid MNC format");

            // TODO: b/69384059 Should throw IllegalArgumentException for the invalid MNC format

            // after the bug got fixed.

            mMncStr = null;

            log("invalid MNC format: " + mncStr);

        }



        mAlphaLong = alphal;

telephony/java/android/telephony/CellIdentityLte.java

+13 −6
Original line number Diff line number Diff line
@@ -114,22 +114,29 @@ public final class CellIdentityLte implements Parcelable { 
        mTac = tac;

        mEarfcn = earfcn;



        // Only allow INT_MAX if unknown string mcc/mnc

        if (mccStr == null || mccStr.matches("^[0-9]{3}$")) {

            mMccStr = mccStr;

        } else if (mccStr.isEmpty()) {

            // If the mccStr parsed from Parcel is empty, set it as null.

        } else if (mccStr.isEmpty() || mccStr.equals(String.valueOf(Integer.MAX_VALUE))) {

            // If the mccStr is empty or unknown, set it as null.

            mMccStr = null;

        } else {

            throw new IllegalArgumentException("invalid MCC format");

            // TODO: b/69384059 Should throw IllegalArgumentException for the invalid MCC format

            // after the bug got fixed.

            mMccStr = null;

            log("invalid MCC format: " + mccStr);

        }



        if (mncStr == null || mncStr.matches("^[0-9]{2,3}$")) {

            mMncStr = mncStr;

        } else if (mncStr.isEmpty()) {

            // If the mncStr parsed from Parcel is empty, set it as null.

        } else if (mncStr.isEmpty() || mncStr.equals(String.valueOf(Integer.MAX_VALUE))) {

            // If the mncStr is empty or unknown, set it as null.

            mMncStr = null;

        } else {

            throw new IllegalArgumentException("invalid MNC format");

            // TODO: b/69384059 Should throw IllegalArgumentException for the invalid MNC format

            // after the bug got fixed.

            mMncStr = null;

            log("invalid MNC format: " + mncStr);

        }



        mAlphaLong = alphal;

telephony/java/android/telephony/CellIdentityWcdma.java

+13 −6
Original line number Diff line number Diff line
@@ -114,22 +114,29 @@ public final class CellIdentityWcdma implements Parcelable { 
        mPsc = psc;

        mUarfcn = uarfcn;



        // Only allow INT_MAX if unknown string mcc/mnc

        if (mccStr == null || mccStr.matches("^[0-9]{3}$")) {

            mMccStr = mccStr;

        } else if (mccStr.isEmpty()) {

            // If the mccStr parsed from Parcel is empty, set it as null.

        } else if (mccStr.isEmpty() || mccStr.equals(String.valueOf(Integer.MAX_VALUE))) {

            // If the mccStr is empty or unknown, set it as null.

            mMccStr = null;

        } else {

            throw new IllegalArgumentException("invalid MCC format");

            // TODO: b/69384059 Should throw IllegalArgumentException for the invalid MCC format

            // after the bug got fixed.

            mMccStr = null;

            log("invalid MCC format: " + mccStr);

        }



        if (mncStr == null || mncStr.matches("^[0-9]{2,3}$")) {

            mMncStr = mncStr;

        } else if (mncStr.isEmpty()) {

            // If the mncStr parsed from Parcel is empty, set it as null.

        } else if (mncStr.isEmpty() || mncStr.equals(String.valueOf(Integer.MAX_VALUE))) {

            // If the mncStr is empty or unknown, set it as null.

            mMncStr = null;

        } else {

            throw new IllegalArgumentException("invalid MNC format");

            // TODO: b/69384059 Should throw IllegalArgumentException for the invalid MNC format

            // after the bug got fixed.

            mMncStr = null;

            log("invalid MNC format: " + mncStr);

        }



        mAlphaLong = alphal;