Merge "Build fix. Unifying task size calculation code." into ub-launcher3-rvc-dev
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 6e9c5a0..14212be 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -436,6 +436,13 @@
sEventChecker.finishNoWait();
}
}
+ // b/156287114
+ try {
+ log("Input: " + mDevice.executeShellCommand("dumpsys input"));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
log("Hierarchy dump for: " + message);
dumpViewHierarchy();
diff --git a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
index ac90b1b..79d20ac 100644
--- a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
+++ b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
@@ -207,7 +207,9 @@
// Workaround for b/154157191
private static boolean ignoreMistatch(boolean successfulGesture, String sequence) {
- return TestProtocol.SEQUENCE_TIS.equals(sequence) && successfulGesture;
+ // b/156287114
+ return false;
+// return TestProtocol.SEQUENCE_TIS.equals(sequence) && successfulGesture;
}
// If the list of actual events matches the list of expected events, returns -1, otherwise