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

Commit 08dc87a0 authored by Tyler Freeman's avatar Tyler Freeman Committed by Cherrypicker Worker
Browse files

fix(non linear font scaling): fix test timeout flakiness 

Fix: 283186902
Test: atest FrameworksCoreTests:android.content.res.FontScaleConverterActivityTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2d5f2f97b65729c6af1d08b5541bad375719e5b6)
Merged-In: I67dc51b587602f72949549ac17253628ad1a2e1a
Change-Id: I67dc51b587602f72949549ac17253628ad1a2e1a
parent 149c2ccf

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();

        });

    }