commit e75f0ad1c4659ae0f059ec7711ab5a8c2957561a
author Nancy Chen <nancychen@google.com> Sat Nov 14 00:57:11 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Nov 14 00:57:11 2015 +0000
tree ccaebb2fe109433fc8b3bcba0a722bf3399e9cc5
parent 415926e185b57abeb3a58359a7c03d9e9d112bf9
parent d87d1c2439ec8340c5c31828a39f7b17891ddf7f

Merge "Fix NPE in ListsFragment." into ub-contactsdialer-a-dev am: a2884c6dbf
am: d87d1c2439

* commit 'd87d1c2439ec8340c5c31828a39f7b17891ddf7f':
  Fix NPE in ListsFragment.

src/com/android/dialer/list/ListsFragment.java

diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index cf999e7..5294498 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -360,7 +360,7 @@
      * expands a voicemail in the call log.
      */
     public void updateTabUnreadCounts() {
-        if (mHasActiveVoicemailProvider) {
+        if (mHasActiveVoicemailProvider && mCallLogQueryHandler != null) {
             mCallLogQueryHandler.fetchVoicemailUnreadCount();
         }
     }