1 files changed, 12 insertions, 3 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
index b57f9b04a..1daccd1a4 100644
--- a/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
+++ b/java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java
@@ -26,6 +26,7 @@ import android.provider.CallLog;
 import android.provider.CallLog.Calls;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
@@ -59,6 +60,7 @@ import com.android.dialer.blocking.FilteredNumbersUtil;
 import com.android.dialer.callcomposer.CallComposerActivity;
 import com.android.dialer.callcomposer.CallComposerContact;
 import com.android.dialer.calldetails.CallDetailsEntries;
+import com.android.dialer.common.ConfigProviderBindings;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.lightbringer.Lightbringer;
@@ -182,7 +184,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
    * The name or number associated with the call. Cached here for use when setting content
    * descriptions on buttons in the actions ViewStub when it is inflated.
    */
-  public CharSequence nameOrNumber;
+  @Nullable public CharSequence nameOrNumber;
   /**
    * The call type or Location associated with the call. Cached here for use when setting text for a
    * voicemail log's call button
@@ -255,8 +257,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
     }
     primaryActionButtonView.setOnClickListener(this);
     primaryActionView.setOnClickListener(mExpandCollapseListener);
-    if (mVoicemailPlaybackPresenter != null) {
+    if (mVoicemailPlaybackPresenter != null
+        && ConfigProviderBindings.get(mContext)
+            .getBoolean(
+                CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT,
+                CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT_FLAG)) {
       primaryActionView.setOnLongClickListener(longPressListener);
+      quickContactView.setOnLongClickListener(longPressListener);
     } else {
       primaryActionView.setOnCreateContextMenuListener(this);
     }
@@ -808,7 +815,9 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
     if (info.lookupUri != null) {
       contact.setContactUri(info.lookupUri.toString());
     }
-    contact.setNameOrNumber((String) nameOrNumber);
+    if (nameOrNumber != null) {
+      contact.setNameOrNumber((String) nameOrNumber);
+    }
     contact.setContactType(getContactType());
     contact.setNumber(number);
     /* second line of contact view. */