commit 738988dc5550bf6813b041ade37723a50c95d91a
author Nancy Chen <nancychen@google.com> Tue Nov 10 00:55:00 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 10 00:55:00 2015 +0000
tree eced7ff8b9d8ec23b7ce4998de7651defaec338a
parent f4581212026a3a2543d81f21b16666f29d97c03e
parent ad60c688155853efcc594e2906fca146fe0266f2

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.

src/com/android/dialer/calllog/CallLogListItemViewHolder.java

diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
index 0087506..89596f2 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
@@ -467,7 +467,8 @@
         }
 
         // 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);