commit 72b3739e7c1fcee41c123421c38cbd5930c4ebbc
author Yorke Lee <yorkelee@google.com> Thu Dec 10 14:19:57 2015 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 14:19:57 2015 -0800
tree 3a65df23bc10fcec9cf4d10bea264b653becd6fa
parent b68a7edb295321b0ae6a0fc8599c3f9dd418d6f1
parent 10464dc151cbe4cfb9bcd734cafb348efa765090

Fix potential NPE in DefaultVoicemailNotifier am: 52cd5fd66d
am: 10464dc151

* commit '10464dc151cbe4cfb9bcd734cafb348efa765090':
  Fix potential NPE in DefaultVoicemailNotifier

src/com/android/dialer/calllog/DefaultVoicemailNotifier.java

diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index c40c993..2b894a1 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -154,7 +154,7 @@
                 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);
                     }
                 }