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

Commit dcece7c2 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

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

am: 97fd2d56

Change-Id: I8c6bb6a8e62c1f27213d5ee898f69de811180c17
parents 9f3d267b 97fd2d56

telephony/java/android/telephony/PhoneNumberRange.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -71,10 +71,10 @@ public final class PhoneNumberRange implements Parcelable { 
    public PhoneNumberRange(@NonNull String countryCode, @NonNull String prefix,

    public PhoneNumberRange(@NonNull String countryCode, @NonNull String prefix,

            @NonNull String lowerBound, @NonNull String upperBound) {

            @NonNull String lowerBound, @NonNull String upperBound) {

        validateLowerAndUpperBounds(lowerBound, 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");

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

            throw new IllegalArgumentException("Prefix must be all numeric");

        }

        }

        mCountryCode = countryCode;

        mCountryCode = countryCode;
@@ -133,10 +133,10 @@ public final class PhoneNumberRange implements Parcelable { 
        if (lowerBound.length() != upperBound.length()) {

        if (lowerBound.length() != upperBound.length()) {

            throw new IllegalArgumentException("Lower and upper bounds must have the same 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");

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

            throw new IllegalArgumentException("Upper bound must be all numeric");

        }

        }

        if (Integer.parseInt(lowerBound) > Integer.parseInt(upperBound)) {

        if (Integer.parseInt(lowerBound) > Integer.parseInt(upperBound)) {