commit f3947d29193b8718d40bb4951257a1a0773326a1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 13 23:23:26 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 13 23:23:26 2024 +0000
tree 3aa234d2d85155f68f54da321d422f71fe832b13
parent 82de984b62bd29d8d9466ebfcf4c75715a94c97f
parent 1f9562b6ccbf0b086ec4cad30ca17a1be70ffb50

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

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

Change-Id: Ie9e3020b74e73f64914ec3f4b08200e8cdfab12e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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