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

Merge "Fix validation problem in PhoneNumberRange" am: 85d5a309ca

Browse Source 
am: 97fd2d5686

Change-Id: I8c6bb6a8e62c1f27213d5ee898f69de811180c17
This commit is contained in:
Hall Liu
2018-12-06 16:32:01 -08:00
committed by android-build-merger
parent 9f3d267b69 97fd2d5686
commit dcece7c289
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/PhoneNumberRange.java
View File

@@ -71,10 +71,10 @@ public final class PhoneNumberRange implements Parcelable {
public PhoneNumberRange(@NonNull String countryCode, @NonNull String prefix,
@NonNull String lowerBound, @NonNull String upperBound) {
validateLowerAndUpperBounds(lowerBound, upperBound);
if (!Pattern.matches("[0-9]+", countryCode)) {
if (!Pattern.matches("[0-9]*", countryCode)) {
throw new IllegalArgumentException("Country code must be all numeric");
}
if (!Pattern.matches("[0-9]+", prefix)) {
if (!Pattern.matches("[0-9]*", prefix)) {
throw new IllegalArgumentException("Prefix must be all numeric");
}
mCountryCode = countryCode;
@@ -133,10 +133,10 @@ public final class PhoneNumberRange implements Parcelable {
if (lowerBound.length() != upperBound.length()) {
throw new IllegalArgumentException("Lower and upper bounds must have the same length");
}
if (!Pattern.matches("[0-9]+", lowerBound)) {
if (!Pattern.matches("[0-9]*", lowerBound)) {
throw new IllegalArgumentException("Lower bound must be all numeric");
}
if (!Pattern.matches("[0-9]+", upperBound)) {
if (!Pattern.matches("[0-9]*", upperBound)) {
throw new IllegalArgumentException("Upper bound must be all numeric");
}
if (Integer.parseInt(lowerBound) > Integer.parseInt(upperBound)) {