Merge "Moving logging Launcher and platform versions before matching" into ub-launcher3-master (7d2f42d9) · Commits · e / os / android_packages_apps_Trebuchet

tests/src/com/android/launcher3/util/rule/TestStabilityRule.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -114,21 +114,20 @@ public class TestStabilityRule implements TestRule {
		throw new RuntimeException(e);
		}

		final Matcher launcherBuildMatcher = LAUNCHER_BUILD.matcher(launcherVersion);
		final String platformVersion = Build.VERSION.INCREMENTAL;

		Log.d(TAG, "Launcher: " + launcherVersion + ", platform: " + platformVersion);

		final Matcher launcherBuildMatcher = LAUNCHER_BUILD.matcher(launcherVersion);
		if (!launcherBuildMatcher.find()) {
		throw new AssertionError("Launcher build match not found");
		}

		final String platformVersion = Build.VERSION.INCREMENTAL;
		final Matcher platformBuildMatcher = PLATFORM_BUILD.matcher(platformVersion);

		if (!platformBuildMatcher.find()) {
		throw new AssertionError("Platform build match not found");
		}

		Log.d(TAG, "Launcher: " + launcherVersion + ", platform: " + platformVersion);

		final int runFlavor;

		if (launcherBuildMatcher.group("local") != null && (