commit 28033a9f4c80c286bbee988cc5492a3ffbaf572e
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 04 20:01:07 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 04 20:01:07 2020 +0000
tree f816ffcf87b138fe50a56d7822cd978090a86bbc
parent c74eef522bb43b214855ebf13a78cb70c7c3fcf4
parent d60e33de3e6bb17931dd946700fc3027a394bf49

Merge "Avoiding cascading "nested events checking" failure after timed-out wait" into ub-launcher3-rvc-dev am: d60e33de3e

Change-Id: I4d79859a14bd2ff83141b89e1a2847533c9c4dac

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 35cc94f..085df74 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1283,10 +1283,10 @@
     public Closable eventsCheck() {
         Assert.assertTrue("Nested event checking", !sCheckingEvents);
         disableSensorRotation();
-        sCheckingEvents = true;
         final int initialPid = getPid();
         if (sEventChecker == null) sEventChecker = new LogEventChecker();
         sEventChecker.start();
+        sCheckingEvents = true;
 
         return () -> {
             if (initialPid != getPid()) {

tests/tapl/com/android/launcher3/tapl/LogEventChecker.java

diff --git a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
index 2141fab..053847c 100644
--- a/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
+++ b/tests/tapl/com/android/launcher3/tapl/LogEventChecker.java
@@ -69,8 +69,9 @@
                 mFinished.await();
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
+            } finally {
+                mFinished = null;
             }
-            mFinished = null;
         }
         mEvents.clear();
         Log.d(SKIP_EVENTS_TAG, "Cleared events");