2 files changed, 9 insertions, 1 deletions
diff --git a/java/com/android/incallui/incall/protocol/PrimaryCallState.java b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
index 791f22ea7..1afa66a91 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryCallState.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryCallState.java
@@ -66,8 +66,12 @@ public class PrimaryCallState {
 
   // TODO: Convert to autovalue. b/34502119
   public static PrimaryCallState createEmptyPrimaryCallState() {
+    return createEmptyPrimaryCallStateWithState(DialerCall.State.IDLE);
+  }
+
+  public static PrimaryCallState createEmptyPrimaryCallStateWithState(int state) {
     return new PrimaryCallState(
-        DialerCall.State.IDLE,
+        state,
         false, /* isVideoCall */
         SessionModificationState.NO_REQUEST,
         new DisconnectCause(DisconnectCause.UNKNOWN),
diff --git a/java/com/android/incallui/incall/protocol/PrimaryInfo.java b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
index 761dd9a81..7fe0a0f6a 100644
--- a/java/com/android/incallui/incall/protocol/PrimaryInfo.java
+++ b/java/com/android/incallui/incall/protocol/PrimaryInfo.java
@@ -41,6 +41,7 @@ public class PrimaryInfo {
   // Used for consistent LetterTile coloring.
   @Nullable public final String contactInfoLookupKey;
   @Nullable public final MultimediaData multimediaData;
+  public final boolean showInCallButtonGrid;
   public final int numberPresentation;
 
   // TODO: Convert to autovalue. b/34502119
@@ -61,6 +62,7 @@ public class PrimaryInfo {
         false,
         null,
         null,
+        true,
         -1);
   }
 
@@ -80,6 +82,7 @@ public class PrimaryInfo {
       boolean shouldShowLocation,
       @Nullable String contactInfoLookupKey,
       @Nullable MultimediaData multimediaData,
+      boolean showInCallButtonGrid,
       int numberPresentation) {
     this.number = number;
     this.name = name;
@@ -96,6 +99,7 @@ public class PrimaryInfo {
     this.shouldShowLocation = shouldShowLocation;
     this.contactInfoLookupKey = contactInfoLookupKey;
     this.multimediaData = multimediaData;
+    this.showInCallButtonGrid = showInCallButtonGrid;
     this.numberPresentation = numberPresentation;
   }