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

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

Browse Source
This commit is contained in:
Cassie Han
2017-11-15 23:21:33 +00:00
committed by Gerrit Code Review
parent e28513f150 2200da1cdc
commit 9b08e4cb8d
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/CellIdentityGsm.java
View File

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

9
telephony/java/android/telephony/CellIdentityLte.java
View File

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

11
telephony/java/android/telephony/CellIdentityWcdma.java
View File

@@ -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");
@@ -136,7 +135,7 @@ public final class CellIdentityWcdma implements Parcelable {
mAlphaLong = alphal;
mAlphaShort = alphas;
}
private CellIdentityWcdma(CellIdentityWcdma cid) {
this(cid.mLac, cid.mCid, cid.mPsc, cid.mUarfcn, cid.mMccStr,
cid.mMncStr, cid.mAlphaLong, cid.mAlphaShort);