From ebcb9c1e251fa37d0daa0234b63f6546af25ffa8 Mon Sep 17 00:00:00 2001
From: Louis Chang <louischang@google.com>
Date: Wed, 12 Jul 2023 11:03:53 +0800
Subject: [PATCH] Attempts fixing test flakiness

There is a race condition between the test and the launched
activity, which could result in NullPointerException and
break the test.

Bug: 289865322
Test: atest ActivityThreadTest over 500 times on cf
Change-Id: I1e13c9c1dd796296263de0984675311866ba61f3
---
 .../src/android/app/activity/ActivityThreadTest.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
index b73a87c8f0d96..48577416b3d06 100644
--- a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
+++ b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
@@ -884,12 +884,13 @@ public class ActivityThreadTest {
             mConfig.setTo(config);
             ++mNumOfConfigChanges;
 
-            if (mConfigLatch != null) {
+            final CountDownLatch configLatch = mConfigLatch;
+            if (configLatch != null) {
                 if (mTestLatch != null) {
                     mTestLatch.countDown();
                 }
                 try {
-                    mConfigLatch.await(TIMEOUT_SEC, TimeUnit.SECONDS);
+                    configLatch.await(TIMEOUT_SEC, TimeUnit.SECONDS);
                 } catch (InterruptedException e) {
                     throw new IllegalStateException(e);
                 }