Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Attempts fixing test flakiness" into udc-qpr-dev am: 03514987c4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24032424

Change-Id: Ica90dde56400662fa8a6b95132d410f513338dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2023-07-13 00:37:47 +00:00
committed by Automerger Merge Worker
parent a66b4c1558 03514987c4
commit 4ecf9ce24c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
View File

@@ -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);
}