diff options
| author | Wink Saville <wink@google.com> | 2013-06-01 08:23:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 08:23:02 -0700 |
| commit | 8ca5d64a39395ef6d9f800e843ef706c7ab8bf51 (patch) | |
| tree | 9017a47baf7802a56d0bf2c048fc12729e1591b3 /telephony | |
| parent | 7d2e3939964fb6512f370059a33206d2c9ec7a0e (diff) | |
| parent | 39136d391ab04e93fd0a01b760e57b6ea079cf4c (diff) | |
| download | frameworks_base-8ca5d64a39395ef6d9f800e843ef706c7ab8bf51.zip frameworks_base-8ca5d64a39395ef6d9f800e843ef706c7ab8bf51.tar.gz frameworks_base-8ca5d64a39395ef6d9f800e843ef706c7ab8bf51.tar.bz2 | |
am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
* commit '39136d391ab04e93fd0a01b760e57b6ea079cf4c':
Fixing crash in PhoneNumberUtils getNumberFromIntent
Diffstat (limited to 'telephony')
| -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")) { |