Snap for 9875146 from 878c1be71d046125d9518bcedef9774a764fe3d9 to udc-release (45c77455) · Commits · e / os / android_packages_apps_DocumentsUI

tests/functional/com/android/documentsui/FileManagementUiTest.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -181,20 +181,22 @@ public class FileManagementUiTest extends ActivityTest<FilesActivity> {

		// Files weren't copied fast enough, so gonna do some polling until they all arrive or copy
		// seems stalled.
		while (true) {
		int maxRetries = 10;
		int retries = 0;
		while (retries++ <= maxRetries) {
		Thread.sleep(200);
		List<DocumentInfo> newChildren = mDocsHelper.listChildren(target, -1);
		if (newChildren.size() == expectedCount) {
		return;
		}

		if (newChildren.size() > expectedCount) {
		if (newChildren.size() > expectedCount && retries >= maxRetries) {
		// Should never happen
		fail("Something wrong with this test case. Copied file count "
		+ newChildren.size() + " exceeds expected number " + expectedCount);
		}

		if (newChildren.size() <= children.size()) {
		if (newChildren.size() <= children.size() && retries >= maxRetries) {
		fail("Only copied " + children.size()
		+ " files, expected to copy " + expectedCount + " files.");
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -69,7 +69,8 @@ public class DarkThemeUiTest extends ThemeUiTestBase {
		}

		@Test
		public void themeNightModeEnable_navigationBarColorShouldBeDark() {
		public void themeNightModeEnable_navigationBarColorShouldBeDark() throws Exception {
		assumeFalse(VersionUtils.isAtLeastS()); // Disable for S dynamic color
		assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_navigationBarColor,
		mTheme.getResources().getColor(android.R.color.black, mTheme));
		}