commit 1f9562b6ccbf0b086ec4cad30ca17a1be70ffb50
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 13 23:05:19 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 13 23:05:19 2024 +0000
tree 2d03411ffcb83a3f30d35d27b14ae8e2b8200d05
parent 293e74d861e236f50530bd65925f2ebc53063e25
parent bb68271e4eced5b67905e50357e817d2178802b4

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

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

diff --git a/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java b/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java
index df4fb44..0941a2b 100644
--- a/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java
+++ b/core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java
@@ -137,7 +137,7 @@
             );
         });
 
-        PollingCheck.waitFor(/* timeout= */ 5000, () -> {
+        PollingCheck.waitFor(/* timeout= */ 7000, () -> {
             AtomicBoolean isActivityAtCorrectScale = new AtomicBoolean(false);
             rule.getScenario().onActivity(activity ->
                     isActivityAtCorrectScale.set(
@@ -146,12 +146,7 @@
                                 .fontScale == fontScale
                     )
             );
-            return isActivityAtCorrectScale.get() && InstrumentationRegistry
-                    .getInstrumentation()
-                    .getContext()
-                    .getResources()
-                    .getConfiguration()
-                    .fontScale == fontScale;
+            return isActivityAtCorrectScale.get();
         });
     }