Merge "Merge "Merge "Ignore LTRIGGER/RTRIGGER/GAS/BRAKE axes for Input test cases" into android12-tests-dev am: f6c2f0ce65" into android12L-tests-dev am: c5f65a2b13"
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
index 209b912..841f161 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
@@ -43,7 +43,10 @@
import org.junit.Rule;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
@@ -53,6 +56,13 @@
private static final String TAG = "InputTestCase";
private static final float TOLERANCE = 0.005f;
+ // Ignore comparing input values for these axes. This is used to prevent breakages caused by
+ // OEMs using custom key layouts to remap GAS/BRAKE to RTRIGGER/LTRIGGER (for example,
+ // b/197062720).
+ private static final Set<Integer> IGNORE_AXES = new HashSet<>(Arrays.asList(
+ MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_RTRIGGER,
+ MotionEvent.AXIS_GAS, MotionEvent.AXIS_BRAKE));
+
private final BlockingQueue<InputEvent> mEvents;
protected final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
@@ -176,6 +186,7 @@
void assertAxis(String testCase, MotionEvent expectedEvent, MotionEvent actualEvent) {
for (int i = 0; i < actualEvent.getPointerCount(); i++) {
for (int axis = MotionEvent.AXIS_X; axis <= MotionEvent.AXIS_GENERIC_16; axis++) {
+ if (IGNORE_AXES.contains(axis)) continue;
assertEquals(testCase + " pointer " + i
+ " (" + MotionEvent.axisToString(axis) + ")",
expectedEvent.getAxisValue(axis, i), actualEvent.getAxisValue(axis, i),
