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

Commit 3d76dadc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Recognizing running "prebuilt" launcher and manually built platform"... 

Merge "Recognizing running "prebuilt" launcher and manually built platform" into ub-launcher3-master
parents bab1101b 1eb46b85

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,8 @@ public class TestStabilityRule implements TestRule { 
            Log.d(TAG, "PLATFORM PRESUBMIT");

            Log.d(TAG, "PLATFORM PRESUBMIT");

            runFlavor = PLATFORM_PRESUBMIT;

            runFlavor = PLATFORM_PRESUBMIT;

        } else if (launcherBuildMatcher.group("platform") != null

        } else if (launcherBuildMatcher.group("platform") != null

                && platformBuildMatcher.group("postsubmit") != null) {

                && (platformBuildMatcher.group("postsubmit") != null

                || platformBuildMatcher.group("commandLine") != null)) {

            Log.d(TAG, "PLATFORM POSTSUBMIT");

            Log.d(TAG, "PLATFORM POSTSUBMIT");

            runFlavor = PLATFORM_POSTSUBMIT;

            runFlavor = PLATFORM_POSTSUBMIT;

        } else {

        } else {