summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-11-10 00:59:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-10 00:59:22 +0000
commit3f166a09865121a493867ee4dae19476a6272cf8 (patch)
treeeced7ff8b9d8ec23b7ce4998de7651defaec338a
parent01b9c20adf95400965702b8e16e17f329a87af6b (diff)
parent738988dc5550bf6813b041ade37723a50c95d91a (diff)
Merge "Fix NPE in For Voicemail item without Uri." into ub-contactsdialer-a-dev am: ad60c68815
am: 738988dc55 * commit '738988dc5550bf6813b041ade37723a50c95d91a': Fix NPE in For Voicemail item without Uri.
-rw-r--r--src/com/android/dialer/calllog/CallLogListItemViewHolder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
index 0087506fd..89596f2e1 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
@@ -467,7 +467,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
}
// For voicemail calls, show the voicemail playback layout; hide otherwise.
- if (callType == Calls.VOICEMAIL_TYPE && mVoicemailPlaybackPresenter != null) {
+ if (callType == Calls.VOICEMAIL_TYPE && mVoicemailPlaybackPresenter != null
+ && !TextUtils.isEmpty(voicemailUri)) {
voicemailPlaybackView.setVisibility(View.VISIBLE);
Uri uri = Uri.parse(voicemailUri);