commit f433fff201859c4c2610ae507798bd66719f2705
author Nancy Chen <nancychen@google.com> Wed Jun 24 22:26:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 22:26:10 2015 +0000
tree d325b61ec85e70804921e5904d8a6505a7d9d529
parent 6942eff643d11245a46376923f1bb2c5b1fce1cd
parent ba23381fd14cd0e635a9057f8eac2e3cc984669a

am ba23381f: am 9f76afa1: Merge "Fix potential crash if uri is unavailable." into mnc-dev

* commit 'ba23381fd14cd0e635a9057f8eac2e3cc984669a':
  Fix potential crash if uri is unavailable.

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);