summaryrefslogtreecommitdiff
path: root/src/com
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-11-10 00:55:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-10 00:55:00 +0000
commit738988dc5550bf6813b041ade37723a50c95d91a (patch)
treeeced7ff8b9d8ec23b7ce4998de7651defaec338a /src/com
parentf4581212026a3a2543d81f21b16666f29d97c03e (diff)
parentad60c688155853efcc594e2906fca146fe0266f2 (diff)
Merge "Fix NPE in For Voicemail item without Uri." into ub-contactsdialer-a-dev
am: ad60c68815 * commit 'ad60c688155853efcc594e2906fca146fe0266f2': Fix NPE in For Voicemail item without Uri.
Diffstat (limited to 'src/com')
-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);