am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"

* commit '39136d391ab04e93fd0a01b760e57b6ea079cf4c': Fixing crash in PhoneNumberUtils getNumberFromIntent
2013-06-01 08:23:02 -07:00
parent 7d2e393996 39136d391a
commit 8ca5d64a39
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")) {