commit fc6fca097e84b39e71c6f04118dd0733caa34538
author Andrew Lee <anwlee@google.com> Mon Jun 29 16:46:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 16:46:27 2015 +0000
tree 2a8df83ef7d1b217365f84943dba660908dde03a
parent ce5aad74c663500ddc4326122130e4753ca8a378
parent 6abbbfba8a98766790b47d1325ca5d0833135817

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

* commit '6abbbfba8a98766790b47d1325ca5d0833135817':
  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;
         }