| commit | 872d293ba8196806ecafcf2436efcd8cd85de99a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 26 21:13:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 21:13:51 2021 +0000 |
| tree | 3f10be51e89b41c4f7f2e4ebe0ae96fc45e34e8f | |
| parent | 59c3b1cf04e074c4322fe3324dc120e4f3d1e841 [diff] | |
| parent | 0284040a82cf427ce31aa0f8478a80b9667dc5aa [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 am: 0284040a82 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15379181 Change-Id: Ia8c37223da60ecb8e2c956b19161a9d8bb34eead
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)