| commit | f66dc6a966d3bcb95b2fa032f6322310b0eef11f | [log] [tgz] |
|---|---|---|
| author | sung_jae <sung_jae.kim@samsung.com> | Tue Aug 27 13:45:18 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 27 13:45:18 2019 -0700 |
| tree | 360a8c169a9c8ec12b2581ccf4f93fc421d6d8d5 | |
| parent | aa562f6dc383f57978731cc8c401d4e8c762c05d [diff] | |
| parent | 78658058dcb6d7fabd5d1b36386a019e2e6c81da [diff] |
Merge "Fix NPE" am: 78658058dc Change-Id: Iab42549310f6fdc6154c57a77721073a414215a2
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index f03a9dc..af3ba5e 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -217,6 +217,9 @@ } String scheme = uri.getScheme(); + if (scheme == null) { + return null; + } if (scheme.equals("tel") || scheme.equals("sip")) { return uri.getSchemeSpecificPart();