Merge changes I14a2c0b6,Ic67566c2,Id0ef9164,Iec48f030,Ibe1f9de6, ...

* changes:
  Handle invalid PhoneAccountHandle component name in MissedCallNotifier
  Use TelephonyManagerCompat for IS_REFRESH
  Updated animation to enter and exit search ui.
  Optimization for incoming call latency.
  Fix for voice screen showing for a short time when making a video call
  Fix incallui to use latest ux mocks for assisted dialing.
  Remove voicemail count changed check for legacy notifications

1 files changed, 7 insertions, 2 deletions

diff --git a/java/com/android/incallui/incall/protocol/PrimaryCallState.java b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
index fe80276c9..4a50fbeaf 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryCallState.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
@@ -21,6 +21,7 @@ import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.telecom.DisconnectCause;
 import android.text.TextUtils;
+import com.android.dialer.assisteddialing.TransformationInfo;
 import com.android.dialer.common.Assert;
 import com.android.incallui.call.DialerCall;
 import com.android.incallui.call.DialerCall.State;
@@ -68,6 +69,7 @@ public class PrimaryCallState {
   public final @ButtonState int swapToSecondaryButtonState;
   public final boolean isAssistedDialed;
   @Nullable public final String customLabel;
+  @Nullable public final TransformationInfo assistedDialingExtras;
 
   // TODO: Convert to autovalue. b/34502119
   public static PrimaryCallState createEmptyPrimaryCallState() {
@@ -100,7 +102,8 @@ public class PrimaryCallState {
         true /* supportsCallOnHold */,
         ButtonState.NOT_SUPPORT /* swapToSecondaryButtonState */,
         false /* isAssistedDialed */,
-        customLabel);
+        customLabel,
+        null /* assistedDialingExtras */);
   }
 
   public PrimaryCallState(
@@ -127,7 +130,8 @@ public class PrimaryCallState {
       boolean supportsCallOnHold,
       @ButtonState int swapToSecondaryButtonState,
       boolean isAssistedDialed,
-      @Nullable String customLabel) {
+      @Nullable String customLabel,
+      @Nullable TransformationInfo assistedDialingExtras) {
     this.state = state;
     this.isVideoCall = isVideoCall;
     this.sessionModificationState = sessionModificationState;
@@ -155,6 +159,7 @@ public class PrimaryCallState {
       Assert.checkArgument(state == State.CALL_PENDING);
     }
     this.customLabel = customLabel;
+    this.assistedDialingExtras = assistedDialingExtras;
   }
 
   @Override