commit 831225d8347e7882eb0928b00ff68b8ea6ea87aa
author Jonathan Miranda <jonmiranda@google.com> Sat Jul 24 03:55:56 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 24 03:55:56 2021 +0000
tree ad3cc50fbffaccc693d7a896fd4413100ec8fb0d
parent 192cbbbdd36423c0f85131c96f17b28690660fff
parent 8f16a7703ebdb333620ade6177c726b7395209be

Merge "resolve merge conflicts of 6d9e8666694eeffda9b1cc3d0945c18249ebe824 to sc-v2-dev" into sc-v2-dev

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)