diff options
author | Nancy Chen <nancychen@google.com> | 2015-06-24 22:15:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-24 22:15:47 +0000 |
commit | ba23381fd14cd0e635a9057f8eac2e3cc984669a (patch) | |
tree | d325b61ec85e70804921e5904d8a6505a7d9d529 | |
parent | b9b07de88e2278007e166dddfe841f399750c36b (diff) | |
parent | 9f76afa1d57d6bba39da713fb349d5fb0eb8d590 (diff) |
am 9f76afa1: Merge "Fix potential crash if uri is unavailable." into mnc-dev
* commit '9f76afa1d57d6bba39da713fb349d5fb0eb8d590':
Fix potential crash if uri is unavailable.
-rw-r--r-- | src/com/android/dialer/voicemail/VoicemailPlaybackPresenter.java | 4 |
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); |