commit 2f7fc6a047ba2ac036f78947f29fd799944fbda6
author Andrew Lee <anwlee@google.com> Mon Jun 29 17:26:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 17:26:55 2015 +0000
tree cb874ef97398442f257ce64ab68b397e868604c5
parent d3b33d45f967e29579fbaa46959b8c915f7a7823
parent fc6fca097e84b39e71c6f04118dd0733caa34538

am fc6fca09: am 6abbbfba: am 220bd7ef: Null protect invocation of getContentResolver.

* commit 'fc6fca097e84b39e71c6f04118dd0733caa34538':
  Null protect invocation of getContentResolver.

src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java

diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index d0fe2e4..92bc089 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -339,7 +339,7 @@
     }
 
     private boolean queryHasContent(Uri voicemailUri) {
-        if (voicemailUri == null) {
+        if (voicemailUri == null || mContext == null) {
             return false;
         }