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

Commit 866d2d55 authored by Cassie Han's avatar Cassie Han Committed by android-build-merger
Browse files

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

am: 9b08e4cb

Change-Id: Ie34638da4087987c19bbc7f9935854ca8fa5688d
parents ec039b94 9b08e4cb

telephony/java/android/telephony/CellIdentityGsm.java

+4 −5
Original line number Diff line number Diff line
@@ -115,11 +115,10 @@ 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() || mccStr.equals(String.valueOf(Integer.MAX_VALUE))) {

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

        } else if (mccStr.isEmpty()) {

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

            mMccStr = null;

        } else {

            throw new IllegalArgumentException("invalid MCC format");
@@ -127,8 +126,8 @@ public final class CellIdentityGsm implements Parcelable { 


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

            mMncStr = mncStr;

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

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

        } else if (mncStr.isEmpty()) {

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

            mMncStr = null;

        } else {

            throw new IllegalArgumentException("invalid MNC format");

telephony/java/android/telephony/CellIdentityLte.java

+4 −5
Original line number Diff line number Diff line
@@ -114,11 +114,10 @@ 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() || mccStr.equals(String.valueOf(Integer.MAX_VALUE))) {

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

        } else if (mccStr.isEmpty()) {

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

            mMccStr = null;

        } else {

            throw new IllegalArgumentException("invalid MCC format");
@@ -126,8 +125,8 @@ public final class CellIdentityLte implements Parcelable { 


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

            mMncStr = mncStr;

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

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

        } else if (mncStr.isEmpty()) {

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

            mMncStr = null;

        } else {

            throw new IllegalArgumentException("invalid MNC format");

telephony/java/android/telephony/CellIdentityWcdma.java

+5 −6
Original line number Diff line number Diff line
@@ -114,11 +114,10 @@ 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() || mccStr.equals(String.valueOf(Integer.MAX_VALUE))) {

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

        } else if (mccStr.isEmpty()) {

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

            mMccStr = null;

        } else {

            throw new IllegalArgumentException("invalid MCC format");
@@ -126,8 +125,8 @@ public final class CellIdentityWcdma implements Parcelable { 


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

            mMncStr = mncStr;

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

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

        } else if (mncStr.isEmpty()) {

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

            mMncStr = null;

        } else {

            throw new IllegalArgumentException("invalid MNC format");