summaryrefslogtreecommitdiff
path: root/src/com/android/dialer/voicemail
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-06-24 21:54:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-24 21:54:33 +0000
commit9f76afa1d57d6bba39da713fb349d5fb0eb8d590 (patch)
treeb39e57d2e21a185b7c7e2b99be5def626a4eddcf /src/com/android/dialer/voicemail
parent0feab0229c1c70248ca411d0e95f79aa2ac70c00 (diff)
parent592a91317218204f6dedeb47473a1cc7f02dab09 (diff)
Merge "Fix potential crash if uri is unavailable." into mnc-dev
Diffstat (limited to 'src/com/android/dialer/voicemail')
-rw-r--r--src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
index 4cd8c4d13..e4f2d4756 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java
@@ -337,6 +337,10 @@ public class VoicemailPlaybackPresenter
}
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);