commit f209fb89e6a86f61457f75305a00fbf2f359bf89
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 28 01:22:45 2020 +0000
committer Harry Zhang <harrytczhang@google.com> Thu Jan 30 00:49:39 2020 +0000
tree 79873e25ddec08c51d054ae32892013df93d8f75
parent 87013f6360b029ede9e847ce0a12206105f970ea

Use pressMenu() in ScreenOff to avoid launching camera.

Bug: 147518703
Test: Manual
Change-Id: Ia1d5c3f9079839ac55fa652f9b7950b49284aa9b
(cherry picked from commit 02ba326bf632b3f7485b7a48173c22c9adef4d4e)

tests/health/scenarios/src/android/platform/test/scenario/system/ScreenOff.java

diff --git a/tests/health/scenarios/src/android/platform/test/scenario/system/ScreenOff.java b/tests/health/scenarios/src/android/platform/test/scenario/system/ScreenOff.java
index 1f5e234..a2e1290 100644
--- a/tests/health/scenarios/src/android/platform/test/scenario/system/ScreenOff.java
+++ b/tests/health/scenarios/src/android/platform/test/scenario/system/ScreenOff.java
@@ -57,8 +57,11 @@
     @After
     public void tearDown() throws RemoteException {
         if (mTurnScreenBackOn.get()) {
-            mDevice.wakeUp();
+            // Wake up the display. wakeUp() is not used here as when the duration is short, the
+            // device might register a double power button press and launch camera.
+            mDevice.pressMenu();
             mDevice.waitForIdle();
+            // Unlock the screen.
             mDevice.pressMenu();
             mDevice.waitForIdle();
         }