Snap for 4507345 from 3c8374ede894e2dee29b574bb2cafa6065d7ff10 to pi-release (1a31db51) · Commits · e / os / android_packages_apps_Dialer

Android.mk

+31 −31

Original line number	Diff line number	Diff line
		@@ -187,18 +187,18 @@ EXCLUDE_EXTRA_PACKAGES :=
		include $(CLEAR_VARS)

		LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
		dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-dagger2:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-grpc-all:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-grpc-core:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2$(COMMON_JAVA_PACKAGE_SUFFIX) \
		dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1$(COMMON_JAVA_PACKAGE_SUFFIX)
		dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.jar \
		dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7.jar \
		dialer-dagger2:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7.jar \
		dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7.jar \
		dialer-grpc-all:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3.jar \
		dialer-grpc-core:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3.jar \
		dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3.jar \
		dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3.jar \
		dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3.jar \
		dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0.jar \
		dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar \
		dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar

		include $(BUILD_HOST_PREBUILT)

		@@ -209,7 +209,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-guava-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -219,7 +219,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-error-prone-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -229,7 +229,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-dagger2-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -239,7 +239,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-disklrucache-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -249,7 +249,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-gifdecoder-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -259,7 +259,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-glide-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -269,7 +269,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-javax-annotation-api-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -279,7 +279,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-libshortcutbadger-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/me/leolin/ShortcutBadger/1.1.13/ShortcutBadger-1.1.13$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/me/leolin/ShortcutBadger/1.1.13/ShortcutBadger-1.1.13.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -289,7 +289,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-javax-inject-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -299,7 +299,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-commons-io-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/commons-io/commons-io/2.4/commons-io-2.4$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/commons-io/commons-io/2.4/commons-io-2.4.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -309,7 +309,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-mime4j-core-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/org/apache/james/apache-mime4j-core/0.7.2/apache-mime4j-core-0.7.2$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/org/apache/james/apache-mime4j-core/0.7.2/apache-mime4j-core-0.7.2.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -319,7 +319,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-mime4j-dom-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/org/apache/james/apache-mime4j-dom/0.7.2/apache-mime4j-dom-0.7.2$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/org/apache/james/apache-mime4j-dom/0.7.2/apache-mime4j-dom-0.7.2.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -329,7 +329,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-core-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -339,7 +339,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-okhttp-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -349,7 +349,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-protobuf-lite-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -359,7 +359,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-stub-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -369,7 +369,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-all-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -379,7 +379,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-context-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-context/1.0.3/grpc-context-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-context/1.0.3/grpc-context-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)
		@@ -389,7 +389,7 @@ include $(CLEAR_VARS)
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-auto-value-target
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3$(COMMON_JAVA_PACKAGE_SUFFIX)
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

java/com/android/dialer/app/DialtactsActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1737,7 +1737,7 @@ public class DialtactsActivity extends TransactionSafeActivity
		Simulator simulator = SimulatorComponent.get(context).getSimulator();
		if (simulator.shouldShow()) {
		simulatorMenuItem.setVisible(true);
		simulatorMenuItem.setActionProvider(simulator.getActionProvider(context));
		simulatorMenuItem.setActionProvider(simulator.getActionProvider(DialtactsActivity.this));
		} else {
		simulatorMenuItem.setVisible(false);
		}

java/com/android/dialer/app/calllog/CallLogAdapter.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -844,7 +844,6 @@ public class CallLogAdapter extends GroupingListAdapter
		// attempt to set the field properly in that case
		viewHolder.isCallComposerCapable = isCallComposerCapable(viewHolder.number);
		viewHolder.setDetailedPhoneDetails(callDetailsEntries);
		viewHolder.duo = getDuo();
		final AsyncTask<Void, Void, Boolean> loadDataTask =
		new AsyncTask<Void, Void, Boolean>() {
		@Override

java/com/android/dialer/app/calllog/CallLogGroupBuilder.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -189,13 +189,26 @@ public class CallLogGroupBuilder {
		mGroupCreator.addGroup(count - groupSize, groupSize);
		}

		/**
		* Returns true when the two input numbers can be considered identical enough for caller ID
		* purposes and put in a call log group.
		*/
		@VisibleForTesting
		boolean equalNumbers(@Nullable String number1, @Nullable String number2) {
		if (PhoneNumberHelper.isUriNumber(number1) \|\| PhoneNumberHelper.isUriNumber(number2)) {
		return compareSipAddresses(number1, number2);
		} else {
		return PhoneNumberUtils.compare(number1, number2);
		}

		// PhoneNumberUtils.compare(String, String) ignores special characters such as '#'. For example,
		// it thinks "123" and "#123" are identical enough for caller ID purposes.
		// When either input number contains special characters, we put the two in the same group iff
		// their raw numbers are exactly the same.
		if (PhoneNumberHelper.numberHasSpecialChars(number1)
		\|\| PhoneNumberHelper.numberHasSpecialChars(number2)) {
		return PhoneNumberHelper.sameRawNumbers(number1, number2);
		}

		return PhoneNumberUtils.compare(number1, number2);
		}

		private boolean isSameAccount(String name1, String name2, String id1, String id2) {

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

+97 −52

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ import com.android.dialer.contactphoto.ContactPhotoManager;
		import com.android.dialer.dialercontact.DialerContact;
		import com.android.dialer.dialercontact.SimDetails;
		import com.android.dialer.duo.Duo;
		import com.android.dialer.duo.DuoComponent;
		import com.android.dialer.duo.DuoConstants;
		import com.android.dialer.lettertile.LetterTileDrawable;
		import com.android.dialer.lettertile.LetterTileDrawable.ContactType;
		@@ -231,7 +232,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		public boolean isSpam;

		public boolean isCallComposerCapable;
		public Duo duo;

		private View.OnClickListener mExpandCollapseListener;
		private final OnActionModeStateChangedListener onActionModeStateChangedListener;
		@@ -359,15 +359,15 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		}

		public static CallLogListItemViewHolder createForTest(Context context) {
		return createForTest(context, null, null);
		return createForTest(context, null, null, new CallLogCache(context));
		}

		public static CallLogListItemViewHolder createForTest(
		Context context,
		View.OnClickListener expandCollapseListener,
		VoicemailPlaybackPresenter voicemailPlaybackPresenter) {
		VoicemailPlaybackPresenter voicemailPlaybackPresenter,
		CallLogCache callLogCache) {
		Resources resources = context.getResources();
		CallLogCache callLogCache = new CallLogCache(context);
		PhoneCallDetailsHelper phoneCallDetailsHelper =
		new PhoneCallDetailsHelper(context, resources, callLogCache);

		@@ -661,6 +661,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		callButtonView.setVisibility(View.VISIBLE);
		}

		boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number);

		switch (callbackAction) {
		case CallbackAction.IMS_VIDEO:
		case CallbackAction.DUO:
		@@ -670,19 +672,28 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		videoCallButtonView.setVisibility(View.GONE);
		break;
		case CallbackAction.VOICE:
		Duo duo = DuoComponent.get(mContext).getDuo();
		// For a voice call, set the secondary callback action to be an IMS video call if it is
		// available. Otherwise try to set it as a Duo call.
		if (CallUtil.isVideoEnabled(mContext)
		&& (hasPlacedCarrierVideoCall() \|\| canSupportCarrierVideoCall())) {
		videoCallButtonView.setTag(IntentProvider.getReturnVideoCallIntentProvider(number));
		videoCallButtonView.setVisibility(View.VISIBLE);
		} else if (duo.isReachable(mContext, number)) {
		break;
		}

		if (isVoicemailNumber) {
		break;
		}

		boolean identifiedSpamCall = isSpamFeatureEnabled && isSpam;
		if (duo.isReachable(mContext, number)) {
		videoCallButtonView.setTag(IntentProvider.getDuoVideoIntentProvider(number));
		videoCallButtonView.setVisibility(View.VISIBLE);
		} else if (duo.isActivated(mContext)) {
		} else if (duo.isActivated(mContext) && !identifiedSpamCall) {
		inviteVideoButtonView.setTag(IntentProvider.getDuoInviteIntentProvider(number));
		inviteVideoButtonView.setVisibility(View.VISIBLE);
		} else if (duo.isEnabled(mContext)) {
		} else if (duo.isEnabled(mContext) && !identifiedSpamCall) {
		if (!duo.isInstalled(mContext)) {
		setUpVideoButtonView.setTag(IntentProvider.getInstallDuoIntentProvider());
		} else {
		@@ -745,7 +756,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		addToExistingContactButtonView.setVisibility(View.GONE);
		}

		boolean isVoicemailNumber = mCallLogCache.isVoicemailNumber(accountHandle, number);
		if (canPlaceCallToNumber && !isBlockedOrSpam && !isVoicemailNumber) {
		sendMessageView.setTag(IntentProvider.getSendSmsIntentProvider(number));
		sendMessageView.setVisibility(View.VISIBLE);
		@@ -776,7 +786,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		private boolean showDuoPrimaryButton() {
		return accountHandle != null
		&& accountHandle.getComponentName().equals(DuoConstants.PHONE_ACCOUNT_COMPONENT_NAME)
		&& duo.isReachable(mContext, number);
		&& DuoComponent.get(mContext).getDuo().isReachable(mContext, number);
		}

		private static boolean hasDialableChar(CharSequence number) {
		@@ -922,7 +932,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		Logger.get(mContext).logImpression(DialerImpression.Type.VOICEMAIL_PLAY_AUDIO_DIRECTLY);
		mVoicemailPrimaryActionButtonClicked = true;
		mExpandCollapseListener.onClick(primaryActionView);
		} else if (view.getId() == R.id.call_with_note_action) {
		return;
		}

		if (view.getId() == R.id.call_with_note_action) {
		CallSubjectDialog.start(
		(Activity) mContext,
		info.photoId,
		@@ -935,7 +948,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		numberType, /* phone number type (e.g. mobile) in second line of contact view */
		getContactType(),
		accountHandle);
		} else if (view.getId() == R.id.block_report_action) {
		return;
		}

		if (view.getId() == R.id.block_report_action) {
		Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_BLOCK_REPORT_SPAM);
		maybeShowBlockNumberMigrationDialog(
		new BlockedNumbersMigrator.Listener() {
		@@ -945,7 +961,10 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		displayNumber, number, countryIso, callType, info.sourceType);
		}
		});
		} else if (view.getId() == R.id.block_action) {
		return;
		}

		if (view.getId() == R.id.block_action) {
		Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_BLOCK_NUMBER);
		maybeShowBlockNumberMigrationDialog(
		new BlockedNumbersMigrator.Listener() {
		@@ -955,25 +974,39 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		displayNumber, number, countryIso, callType, info.sourceType);
		}
		});
		} else if (view.getId() == R.id.unblock_action) {
		return;
		}

		if (view.getId() == R.id.unblock_action) {
		Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_UNBLOCK_NUMBER);
		mBlockReportListener.onUnblock(
		displayNumber, number, countryIso, callType, info.sourceType, isSpam, blockId);
		} else if (view.getId() == R.id.report_not_spam_action) {
		return;
		}

		if (view.getId() == R.id.report_not_spam_action) {
		Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_REPORT_AS_NOT_SPAM);
		mBlockReportListener.onReportNotSpam(
		displayNumber, number, countryIso, callType, info.sourceType);
		} else if (view.getId() == R.id.call_compose_action) {
		return;
		}

		if (view.getId() == R.id.call_compose_action) {
		LogUtil.i("CallLogListItemViewHolder.onClick", "share and call pressed");
		Logger.get(mContext).logImpression(DialerImpression.Type.CALL_LOG_SHARE_AND_CALL);
		Activity activity = (Activity) mContext;
		activity.startActivityForResult(
		CallComposerActivity.newIntent(activity, buildContact()),
		ActivityRequestCodes.DIALTACTS_CALL_COMPOSER);
		} else if (view.getId() == R.id.share_voicemail) {
		return;
		}

		if (view.getId() == R.id.share_voicemail) {
		Logger.get(mContext).logImpression(DialerImpression.Type.VVM_SHARE_PRESSED);
		mVoicemailPlaybackPresenter.shareVoicemail();
		} else {
		return;
		}

		logCallLogAction(view.getId());

		final IntentProvider intentProvider = (IntentProvider) view.getTag();
		@@ -991,13 +1024,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		// intents need to be started using startActivityForResult instead of the usual startActivity
		String packageName = intent.getPackage();
		if (DuoConstants.PACKAGE_NAME.equals(packageName)) {
		Logger.get(mContext)
		.logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG);
		if (isNonContactEntry(info)) {
		Logger.get(mContext)
		.logImpression(
		DialerImpression.Type.LIGHTBRINGER_NON_CONTACT_VIDEO_REQUESTED_FROM_CALL_LOG);
		}
		startDuoActivity(intent);
		} else if (CallDetailsActivity.isLaunchIntent(intent)) {
		PerformanceReport.recordClick(UiAction.Type.OPEN_CALL_DETAIL);
		@@ -1007,11 +1033,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		if (Intent.ACTION_CALL.equals(intent.getAction())
		&& intent.getIntExtra(TelecomManager.EXTRA_START_CALL_WITH_VIDEO_STATE, -1)
		== VideoProfile.STATE_BIDIRECTIONAL) {
		Logger.get(mContext)
		.logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG);
		Logger.get(mContext).logImpression(DialerImpression.Type.IMS_VIDEO_REQUESTED_FROM_CALL_LOG);
		}
		DialerUtils.startActivityWithErrorToast(mContext, intent);
		if (intent.getDataString().contains(DuoConstants.PACKAGE_NAME)) {
		Logger.get(mContext).logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_INSTALL);
		}

		DialerUtils.startActivityWithErrorToast(mContext, intent);
		}
		}

		@@ -1023,6 +1051,23 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		}

		private void startDuoActivity(Intent intent) {
		if (DuoConstants.DUO_ACTIVATE_ACTION.equals(intent.getAction())) {
		Logger.get(mContext).logImpression(DialerImpression.Type.DUO_CALL_LOG_SET_UP_ACTIVATE);
		} else if (DuoConstants.DUO_INVITE_ACTION.equals(intent.getAction())) {
		Logger.get(mContext).logImpression(DialerImpression.Type.DUO_CALL_LOG_INVITE);
		} else if (DuoConstants.DUO_CALL_ACTION.equals(intent.getAction())) {
		Logger.get(mContext)
		.logImpression(DialerImpression.Type.LIGHTBRINGER_VIDEO_REQUESTED_FROM_CALL_LOG);
		if (isNonContactEntry(info)) {
		Logger.get(mContext)
		.logImpression(
		DialerImpression.Type.LIGHTBRINGER_NON_CONTACT_VIDEO_REQUESTED_FROM_CALL_LOG);
		}
		} else {
		throw Assert.createIllegalStateFailException(
		"Duo intent with invalid action" + intent.getAction());
		}

		try {
		Activity activity = (Activity) mContext;
		activity.startActivityForResult(intent, ActivityRequestCodes.DIALTACTS_DUO);