Merge "Ensure null/empty phone number does not crash international number check." into oc-dev (0f542b48) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/PhoneNumberUtils.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1449,6 +1449,11 @@ public class PhoneNumberUtils
		* @hide
		*/
		public static boolean isInternationalNumber(String phoneNumber, String defaultCountryIso) {
		// If no phone number is provided, it can't be international.
		if (TextUtils.isEmpty(phoneNumber)) {
		return false;
		}

		// If it starts with # or * its not international.
		if (phoneNumber.startsWith("#") \|\| phoneNumber.startsWith("*")) {
		return false;