Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03514987 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Attempts fixing test flakiness" into udc-qpr-dev

parents 5d440b72 ebcb9c1e

core/tests/coretests/src/android/app/activity/ActivityThreadTest.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

                }