summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-06-24 22:39:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-24 22:39:47 +0000
commit704ad42f34c8ac57a37550513905076b7fdb32ba (patch)
tree300c8664a0f31ec82d01f1e05af6c17615a56998 /src
parent68a01eb83a8894d930650c6a5034b0dd7dae106a (diff)
parentf433fff201859c4c2610ae507798bd66719f2705 (diff)
am f433fff2: am ba23381f: am 9f76afa1: Merge "Fix potential crash if uri is unavailable." into mnc-dev
* commit 'f433fff201859c4c2610ae507798bd66719f2705': Fix potential crash if uri is unavailable.
Diffstat (limited to 'src')
-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);