diff options
| author | Wink Saville <wink@google.com> | 2013-06-01 09:52:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-01 09:52:05 -0700 |
| commit | 61b7e872bf043a1a23d847ada7063e6fdcf6ddad (patch) | |
| tree | ee0adae68f4caca85fd427f0280673032c7d935b | |
| parent | 1b1c39d773e7ebf8cb2dca62b3ed1a0727c268e1 (diff) | |
| parent | ec82a7bde5970b76f2940db25e35865a23c6ebc2 (diff) | |
| download | frameworks_base-61b7e872bf043a1a23d847ada7063e6fdcf6ddad.zip frameworks_base-61b7e872bf043a1a23d847ada7063e6fdcf6ddad.tar.gz frameworks_base-61b7e872bf043a1a23d847ada7063e6fdcf6ddad.tar.bz2 | |
am ec82a7bd: am 8ca5d64a: am 39136d39: Merge "Fixing crash in PhoneNumberUtils getNumberFromIntent"
* commit 'ec82a7bde5970b76f2940db25e35865a23c6ebc2':
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")) { |