Merge "Waiting for Launcher to restart after enabling test provider" into sc-v2-dev (543f73a0) · Commits · e / os / android_packages_apps_Trebuchet

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -251,8 +251,19 @@ public final class LauncherInstrumentation {
		} else {
		try {
		final int userId = ContextUtils.getUserId(getContext());
		final String launcherPidCommand = "pidof " + pi.packageName;
		final String initialPid = mDevice.executeShellCommand(launcherPidCommand)
		.replaceAll("\\s", "");
		mDevice.executeShellCommand(
		"pm enable --user " + userId + " " + cn.flattenToString());
		// Wait for Launcher restart after enabling test provider.
		for (int i = 0; i < 100; ++i) {
		final String currentPid = mDevice.executeShellCommand(launcherPidCommand)
		.replaceAll("\\s", "");
		if (!currentPid.isEmpty() && !currentPid.equals(initialPid)) break;
		if (i == 99) fail("Launcher didn't restart after enabling test provider");
		SystemClock.sleep(100);
		}
		} catch (IOException e) {
		fail(e.toString());
		}