summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-12-10 14:19:57 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-10 14:19:57 -0800
commit72b3739e7c1fcee41c123421c38cbd5930c4ebbc (patch)
tree3a65df23bc10fcec9cf4d10bea264b653becd6fa
parentb68a7edb295321b0ae6a0fc8599c3f9dd418d6f1 (diff)
parent10464dc151cbe4cfb9bcd734cafb348efa765090 (diff)
Fix potential NPE in DefaultVoicemailNotifier am: 52cd5fd66d
am: 10464dc151 * commit '10464dc151cbe4cfb9bcd734cafb348efa765090': Fix potential NPE in DefaultVoicemailNotifier
-rw-r--r--src/com/android/dialer/calllog/DefaultVoicemailNotifier.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index c40c99384..2b894a12d 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -154,7 +154,7 @@ public class DefaultVoicemailNotifier {
if (TextUtils.isEmpty(name)) {
// Look it up in the database.
name = mNameLookupQuery.query(newCall.number);
- if (TextUtils.isEmpty(name)) {
+ if (TextUtils.isEmpty(name) && !TextUtils.isEmpty(newCall.number)) {
name = PhoneNumberUtils.formatNumber(newCall.number, newCall.countryIso);
}
}