Merge "Ensure null/empty phone number does not crash international number check." into oc-dev

2017-06-01 07:07:18 +00:00
parent 944b0c73a4 438559e183
commit 0f542b48fb
1 changed files with 5 additions and 0 deletions
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -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;