commit d87d1c2439ec8340c5c31828a39f7b17891ddf7f
author Nancy Chen <nancychen@google.com> Sat Nov 14 00:52:58 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Nov 14 00:52:58 2015 +0000
tree ccaebb2fe109433fc8b3bcba0a722bf3399e9cc5
parent b1b5d18a6447b9a3f57e0a8616f84346bc3c77ce
parent a2884c6dbfc9ec2d0a7c5123ec9d0824fc4ee099

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

* commit 'a2884c6dbfc9ec2d0a7c5123ec9d0824fc4ee099':
  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();
         }
     }