commit e7f064eb85cec8191467db5c0014ffff092e5c14
author vadimt <vadimt@google.com> Fri Jul 23 18:53:56 2021 -0700
committer Vadim Tryshev <vadimt@google.com> Sat Jul 24 01:55:50 2021 +0000
tree ce3ed743130625cfe43ba43380a2bce5947f36cf
parent 8ace5d204bfe3adff7491aca228a53dedf1c3e50

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

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

diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
index 32dd21c..c24fc8e 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 @@
             Pattern.compile("^("
                     + "(?<local>(BuildFromAndroidStudio|"
                     + "([0-9]+|[A-Z])-eng\\.[a-z]+\\.[0-9]+\\.[0-9]+))|"
-                    + "(?<presubmit>([0-9]+|[A-Z])-P[0-9]+)|"
-                    + "(?<postsubmit>([0-9]+|[A-Z])-[0-9]+)|"
-                    + "(?<platform>[0-9]+|[A-Z])"
+                    + "(?<platform>[A-Z][a-z]*)"
                     + ")$");
     private static final Pattern PLATFORM_BUILD =
             Pattern.compile("^("
@@ -56,7 +54,7 @@
     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)