summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-12-10 14:15:36 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-10 14:15:36 -0800
commit10464dc151cbe4cfb9bcd734cafb348efa765090 (patch)
tree1527a65ba849ba6102ebf24f88e61cd1877a6714
parentde4f0f537884365672258bed7895e3ab367b5a7a (diff)
parent52cd5fd66d0b97e066f89281eb55016dedfeec3a (diff)
Fix potential NPE in DefaultVoicemailNotifier
am: 52cd5fd66d * commit '52cd5fd66d0b97e066f89281eb55016dedfeec3a': 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);
}
}