From e7f064eb85cec8191467db5c0014ffff092e5c14 Mon Sep 17 00:00:00 2001 From: vadimt Date: Fri, 23 Jul 2021 18:53:56 -0700 Subject: [PATCH] Re-enabling getting stability flavor. Can parse Launcher version Tiramisu. Also removes patterns that were used in the unbundled branch. Test: presubmit Bug: 194528425 Change-Id: I43cca43ed1735cf8ed8845a614768bc42b1403f6 --- .../com/android/launcher3/util/rule/TestStabilityRule.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java index 32dd21c8c2..c24fc8e6c2 100644 --- a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java +++ b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java @@ -41,9 +41,7 @@ public class TestStabilityRule implements TestRule { Pattern.compile("^(" + "(?(BuildFromAndroidStudio|" + "([0-9]+|[A-Z])-eng\\.[a-z]+\\.[0-9]+\\.[0-9]+))|" - + "(?([0-9]+|[A-Z])-P[0-9]+)|" - + "(?([0-9]+|[A-Z])-[0-9]+)|" - + "(?[0-9]+|[A-Z])" + + "(?[A-Z][a-z]*)" + ")$"); private static final Pattern PLATFORM_BUILD = Pattern.compile("^(" @@ -56,7 +54,7 @@ public class TestStabilityRule implements TestRule { public static final int PLATFORM_PRESUBMIT = 0x8; public static final int PLATFORM_POSTSUBMIT = 0x10; - private static int sRunFlavor = PLATFORM_PRESUBMIT; // b/194528425 + private static int sRunFlavor; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD)