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

Browse Source
This commit is contained in:
Louis Chang
2023-07-13 00:12:46 +00:00
committed by Android (Google) Code Review
parent 5d440b72fa ebcb9c1e25
commit 03514987c4
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); mConfig.setTo(config);
++mNumOfConfigChanges; ++mNumOfConfigChanges;
if (mConfigLatch != null) { final CountDownLatch configLatch = mConfigLatch;
if (configLatch != null) {
if (mTestLatch != null) { if (mTestLatch != null) {
mTestLatch.countDown(); mTestLatch.countDown();
} }
try { try {
mConfigLatch.await(TIMEOUT_SEC, TimeUnit.SECONDS); configLatch.await(TIMEOUT_SEC, TimeUnit.SECONDS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }