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

* commit '8ca5d64a39395ef6d9f800e843ef706c7ab8bf51': Fixing crash in PhoneNumberUtils getNumberFromIntent
2013-06-01 08:27:41 -07:00
parent d19068a7d2 8ca5d64a39
commit ec82a7bde5
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")) {