commit ef93faed606696c610d9428405b03eb17a890069
author Andrew Lee <anwlee@google.com> Thu Jun 25 17:33:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 17:33:55 2015 +0000
tree 5384ee92055ad25b7126f3d983fca242a6447bfd
parent 9f76afa1d57d6bba39da713fb349d5fb0eb8d590
parent 9301ca9766c828a03bad858a17cccfcb16611481

Merge "Enable proximity sensor onPause." into mnc-dev

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 41a471d..d0fe2e4 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -339,6 +339,10 @@
     }
 
     private boolean queryHasContent(Uri voicemailUri) {
+        if (voicemailUri == null) {
+            return false;
+        }
+
         ContentResolver contentResolver = mContext.getContentResolver();
         Cursor cursor = contentResolver.query(
                 voicemailUri, HAS_CONTENT_PROJECTION, null, null, null);