Merge "fix(non linear font scaling): fix test timeout flakiness" into udc-dev (1f9562b6) · Commits · e / os / android_frameworks_base

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

+2 −7

Original line number	Original line	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);		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;
	});		});
	}		}