| commit | 0284040a82cf427ce31aa0f8478a80b9667dc5aa | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 26 20:58:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 20:58:06 2021 +0000 |
| tree | 0da7e95d1cfd9d9e622589073b4d30e8cd25d92b | |
| parent | 6c482bc9e1928a90a7dbf7faf543aa979d215f01 [diff] | |
| parent | 4a0cd5abffb5ac5ea48fc7b7553943c437ba42e7 [diff] |
Merge "Re-enabling getting stability flavor. Can parse Launcher version Tiramisu. Also removes patterns that were used in the unbundled branch." into sc-v2-dev am: 4a0cd5abff Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15379181 Change-Id: I14d7d314ec1b9f3ac2dd970470721847058be5b7
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)