2 files changed, 18 insertions, 0 deletions
diff --git a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java
index 35f36f727..ccb132b95 100644
--- a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java
+++ b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodFactory.java
@@ -19,12 +19,15 @@ package com.android.incallui.answer.impl.answermethod;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.Fragment;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.ActivityCompat;
 import com.android.incallui.util.AccessibilityUtil;
 
 /** Creates the appropriate {@link AnswerMethod} for the circumstances. */
 public class AnswerMethodFactory {
+  private static boolean shouldUseTwoButtonMethodForTesting;
 
   @NonNull
   public static AnswerMethod createAnswerMethod(@NonNull Activity activity) {
@@ -45,7 +48,17 @@ public class AnswerMethodFactory {
     return !(answerMethod instanceof TwoButtonMethod) && needTwoButton(answerMethod.getActivity());
   }
 
+  @VisibleForTesting
+  public static void setShouldUseTwoButtonMethodForTesting(boolean shouldUse) {
+    shouldUseTwoButtonMethodForTesting = shouldUse;
+  }
+
   private static boolean needTwoButton(@NonNull Activity activity) {
+    if (shouldUseTwoButtonMethodForTesting) {
+      LogUtil.i("AnswerMethodFactory.needTwoButton", "enabled for testing");
+      return true;
+    }
+
     return AccessibilityUtil.isTouchExplorationEnabled(activity)
         || ActivityCompat.isInMultiWindowMode(activity);
   }
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index d0931dd3d..954fdc910 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -44,6 +44,7 @@ import com.android.incallui.call.DialerCall.State;
 import com.android.incallui.latencyreport.LatencyReport;
 import com.android.incallui.util.TelecomCallUtil;
 import com.android.incallui.videotech.utils.SessionModificationState;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
@@ -509,6 +510,10 @@ public class CallList implements DialerCallDelegate {
     return mCallById.get(callId);
   }
 
+  public Collection<DialerCall> getAllCalls() {
+    return mCallById.values();
+  }
+
   /** Returns first call found in the call map with the specified state. */
   public DialerCall getFirstCallWithState(int state) {
     return getCallWithState(state, 0);