commit d4b102dbc55173ca695d5093b3c9242e1bdb4d11
author Jonathan Miranda <jonmiranda@google.com> Sat Jul 24 01:17:24 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 24 01:17:24 2021 +0000
tree 403d7cb932b13cceed27d3d7127813a41dae1216
parent 245ba85f4ef33e1a1b69c691eee01e21909a9e32
parent 0658dc78e382f499a9fe38931f9e51eb977e0a71

Merge "resolve merge conflicts of 2e8356ba6451008b1a6317072a8b7a28960af158 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp

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

diff --git a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
index 0e27b61..32dd21c 100644
--- a/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
+++ b/tests/src/com/android/launcher3/util/rule/TestStabilityRule.java
@@ -56,7 +56,7 @@
     public static final int PLATFORM_PRESUBMIT = 0x8;
     public static final int PLATFORM_POSTSUBMIT = 0x10;
 
-    private static int sRunFlavor;
+    private static int sRunFlavor = PLATFORM_PRESUBMIT; // b/194528425
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)