Merge "Fix NPE"

2019-08-27 20:14:20 +00:00
parent c046f9f039 ed91c3a159
commit 78658058dc
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();