commit 9f76afa1d57d6bba39da713fb349d5fb0eb8d590
author Nancy Chen <nancychen@google.com> Wed Jun 24 21:54:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 24 21:54:33 2015 +0000
tree b39e57d2e21a185b7c7e2b99be5def626a4eddcf
parent 0feab0229c1c70248ca411d0e95f79aa2ac70c00
parent 592a91317218204f6dedeb47473a1cc7f02dab09

Merge "Fix potential crash if uri is unavailable." 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 4cd8c4d..e4f2d47 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -337,6 +337,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);