diff options
| author | Wink Saville <wink@google.com> | 2013-06-01 14:09:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-01 14:09:53 +0000 |
| commit | 39136d391ab04e93fd0a01b760e57b6ea079cf4c (patch) | |
| tree | e3ae59872262b71ceb5b330d289919dadf39d798 | |
| parent | 9b76b2d29fa338a128f699a1f40f7f5916a512af (diff) | |
| parent | 2227067d99af771e86ce507e952fd5ff5d429a89 (diff) | |
| download | frameworks_base-39136d391ab04e93fd0a01b760e57b6ea079cf4c.zip frameworks_base-39136d391ab04e93fd0a01b760e57b6ea079cf4c.tar.gz frameworks_base-39136d391ab04e93fd0a01b760e57b6ea079cf4c.tar.bz2 | |
Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
| -rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ 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")) { |