Merge "Fix NPE" am: 78658058dc

am: f66dc6a966 Change-Id: If19ae7caa499cadea126ae8d29f83361a71708e1
2019-08-27 13:59:40 -07:00
parent 48f566d5a9 f66dc6a966
commit 085bce44f9
1 changed files with 3 additions and 0 deletions
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -217,6 +217,9 @@ public class PhoneNumberUtils {
        }

        String scheme = uri.getScheme();
+        if (scheme == null) {
+            return null;
+        }

        if (scheme.equals("tel") || scheme.equals("sip")) {
            return uri.getSchemeSpecificPart();