commit bc4bfc5fcf40f88e9ebf9b7fd4c2f9fe3a8c000b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 09 02:33:52 2020 +0000
committer Harry Zhang <harrytczhang@google.com> Mon Jan 13 20:11:33 2020 +0000
tree 34d919f28528090fa20c13b3e86dcaa6bafce0c6
parent c258f5645485edff5e4e8f487fb2f87277491096

Updated the AOSP idle CUJ to include the NaturalOrientationRule.

Bug: 147235840
Test: Manual
Change-Id: Ife279cd9d97654256a84761472c83fc8939c0591
(cherry picked from commit 09d80126d66fd1132fda1f12fbb5bac8a70e9714)

tests/health/scenarios/src/android/platform/test/scenario/sleep/Idle.java

diff --git a/tests/health/scenarios/src/android/platform/test/scenario/sleep/Idle.java b/tests/health/scenarios/src/android/platform/test/scenario/sleep/Idle.java
index 882523c..4efbd07 100644
--- a/tests/health/scenarios/src/android/platform/test/scenario/sleep/Idle.java
+++ b/tests/health/scenarios/src/android/platform/test/scenario/sleep/Idle.java
@@ -18,8 +18,10 @@
 
 import android.os.SystemClock;
 import android.platform.test.option.LongOption;
+import android.platform.test.rule.NaturalOrientationRule;
 import android.platform.test.scenario.annotation.Scenario;
 
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,6 +33,9 @@
 @Scenario
 @RunWith(JUnit4.class)
 public class Idle {
+    // Class-level rules
+    @ClassRule public static NaturalOrientationRule orientationRule = new NaturalOrientationRule();
+
     @Rule public final LongOption mDurationMs = new LongOption("durationMs").setDefault(1000L);
 
     @Test