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

Commit a0cb9b86 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Removing @Stability flavors for unbundled." into sc-dev

parents 4b6a6c00 2ecf1262

quickstep/tests/src/com/android/quickstep/DigitalWellBeingToastTest.java

+0 −3
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ package com.android.quickstep; 
import static androidx.test.InstrumentationRegistry.getInstrumentation;



import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT;

import static com.android.launcher3.util.rule.TestStabilityRule.UNBUNDLED_POSTSUBMIT;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;
@@ -18,7 +16,6 @@ import androidx.test.filters.LargeTest; 
import androidx.test.runner.AndroidJUnit4;



import com.android.launcher3.Launcher;

import com.android.launcher3.util.rule.TestStabilityRule;

import com.android.quickstep.views.DigitalWellBeingToast;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

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

+0 −10
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ public class TestStabilityRule implements TestRule { 
                    + ")$");



    public static final int LOCAL = 0x1;

    public static final int UNBUNDLED_PRESUBMIT = 0x2;

    public static final int UNBUNDLED_POSTSUBMIT = 0x4;

    public static final int PLATFORM_PRESUBMIT = 0x8;

    public static final int PLATFORM_POSTSUBMIT = 0x10;
@@ -136,14 +134,6 @@ public class TestStabilityRule implements TestRule { 
                        platformBuildMatcher.group("postsubmit") != null)) {

            Log.d(TAG, "LOCAL RUN");

            sRunFlavor = LOCAL;

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

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

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

            sRunFlavor = UNBUNDLED_PRESUBMIT;

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

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

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

            sRunFlavor = UNBUNDLED_POSTSUBMIT;

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

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

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