commit 8ca5d64a39395ef6d9f800e843ef706c7ab8bf51
author Wink Saville <wink@google.com> Sat Jun 01 08:23:02 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 01 08:23:02 2013 -0700
tree 9017a47baf7802a56d0bf2c048fc12729e1591b3
parent 7d2e3939964fb6512f370059a33206d2c9ec7a0e
parent 39136d391ab04e93fd0a01b760e57b6ea079cf4c

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

* commit '39136d391ab04e93fd0a01b760e57b6ea079cf4c':
  Fixing crash in PhoneNumberUtils getNumberFromIntent

telephony/java/android/telephony/PhoneNumberUtils.java

diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 8b85d8c..3ae2106 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -152,6 +152,11 @@
         String number = null;
 
         Uri uri = intent.getData();
+
+        if (uri == null) {
+            return null;
+        }
+
         String scheme = uri.getScheme();
 
         if (scheme.equals("tel") || scheme.equals("sip")) {