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

Commit 5e40773d authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge changes I67dc51b5,I6546759a,I258629e1,I74cc61fd,I74b2b757, ... into... 

Merge changes I67dc51b5,I6546759a,I258629e1,I74cc61fd,I74b2b757, ... into udc-dev-plus-aosp am: 67d4d25c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24679463



Change-Id: I493d61bdf997489caa1a90b772ce675efbd5a04e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4494f0e6 67d4d25c

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

        });

    }