Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0284040a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Re-enabling getting stability flavor. Can parse Launcher version... 

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: 4a0cd5ab

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15379181

Change-Id: I14d7d314ec1b9f3ac2dd970470721847058be5b7
parents 6c482bc9 4a0cd5ab

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

+2 −4
Original line number Diff line number Diff line
@@ -41,9 +41,7 @@ public class TestStabilityRule implements TestRule { 
            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 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)