Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"

2013-06-01 14:09:53 +00:00
parent 9b76b2d29f 2227067d99
commit 39136d391a
1 changed files with 5 additions and 0 deletions
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -152,6 +152,11 @@ public class PhoneNumberUtils
        String number = null;

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

        if (scheme.equals("tel") || scheme.equals("sip")) {