Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix(non linear font scaling): fix test timeout flakiness" into udc-qpr-dev

Browse Source
This commit is contained in:
Tyler Freeman
2023-06-22 20:31:10 +00:00
committed by Android (Google) Code Review
parent d004fc453b 08dc87a0f0
commit c163059eb9
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java
View File

@@ -137,7 +137,7 @@ public class FontScaleConverterActivityTest {
); );
}); });
PollingCheck.waitFor(/* timeout= */ 5000, () -> { PollingCheck.waitFor(/* timeout= */ 7000, () -> {
AtomicBoolean isActivityAtCorrectScale = new AtomicBoolean(false); AtomicBoolean isActivityAtCorrectScale = new AtomicBoolean(false);
rule.getScenario().onActivity(activity -> rule.getScenario().onActivity(activity ->
isActivityAtCorrectScale.set( isActivityAtCorrectScale.set(
@@ -146,12 +146,7 @@ public class FontScaleConverterActivityTest {
.fontScale == fontScale .fontScale == fontScale
) )
); );
return isActivityAtCorrectScale.get() && InstrumentationRegistry return isActivityAtCorrectScale.get();
.getInstrumentation()
.getContext()
.getResources()
.getConfiguration()
.fontScale == fontScale;
}); });
} }