Merge "Fix NPE" am: 78658058dc am: f66dc6a966 am: 085bce44f9

am: aef181528b Change-Id: I4c9552e5d70f90bbe9fc6712f1a72c5e4499b731
2019-08-27 14:22:03 -07:00
parent 240c420e27 aef181528b
commit 048b643bd8
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();