commit f1bbd24164f82698bbfa31a4598f39980fde8e3c
author Nancy Chen <nancychen@google.com> Mon May 11 21:19:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 11 21:19:05 2015 +0000
tree bf6521997ed99bdecd7c1f196ae790a5c956b0b5
parent 9152f9240d4636a339cf54a11fd75bd0d91835fc
parent 4e4deabd0d9691e48353d10769c3642851fd015b

am 4e4deabd: am 92e8d005: Merge "Fix crash in voicemail notifications." into mnc-dev

* commit '4e4deabd0d9691e48353d10769c3642851fd015b':
  Fix crash in voicemail notifications.

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 61f8635..8241811 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -143,7 +143,7 @@
                 }
             }
             // Check if this is the new call we need to notify about.
-            if (newCallUri != null &&
+            if (newCallUri != null && newCall.voicemailUri != null &&
                     ContentUris.parseId(newCallUri) == ContentUris.parseId(newCall.voicemailUri)) {
                 callToNotify = newCall;
             }