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

Commit 8e68b9d0 authored by Tyler Freeman's avatar Tyler Freeman Committed by Android (Google) Code Review
Browse files

Merge "fix(non linear font scaling): increase timeout to fix flaky test" into main

parents 767aa9b7 8590710e

core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public class FontScaleConverterActivityTest { 
            );

        });



        PollingCheck.waitFor(/* timeout= */ 7000, () -> {

        PollingCheck.waitFor(/* timeout= */ 10000, () -> {

            AtomicBoolean isActivityAtCorrectScale = new AtomicBoolean(false);

            rule.getScenario().onActivity(activity ->

                    isActivityAtCorrectScale.set(
@@ -163,7 +163,7 @@ public class FontScaleConverterActivityTest { 
        });



        PollingCheck.waitFor(

                /* timeout= */ 5000,

                /* timeout= */ 10000,

                () -> InstrumentationRegistry.getInstrumentation()

                                        .getContext()

                                        .getResources()