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

Commit c7098857 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "fix(non linear font scaling): fix test timeout flakiness" into... 

Merge "Merge "fix(non linear font scaling): fix test timeout flakiness" into udc-qpr-dev am: c163059e" into udc-qpr-dev-plus-aosp
parents bed9daa9 931f124b

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

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

        });



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

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

            AtomicBoolean isActivityAtCorrectScale = new AtomicBoolean(false);

            rule.getScenario().onActivity(activity ->

                    isActivityAtCorrectScale.set(
@@ -146,12 +146,7 @@ public class FontScaleConverterActivityTest { 
                                .fontScale == fontScale

                    )

            );

            return isActivityAtCorrectScale.get() && InstrumentationRegistry

                    .getInstrumentation()

                    .getContext()

                    .getResources()

                    .getConfiguration()

                    .fontScale == fontScale;

            return isActivityAtCorrectScale.get();

        });

    }