From f209fb89e6a86f61457f75305a00fbf2f359bf89 Mon Sep 17 00:00:00 2001 From: Automerger Merge Worker Date: Tue, 28 Jan 2020 01:22:45 +0000 Subject: Use pressMenu() in ScreenOff to avoid launching camera. Bug: 147518703 Test: Manual Change-Id: Ia1d5c3f9079839ac55fa652f9b7950b49284aa9b (cherry picked from commit 02ba326bf632b3f7485b7a48173c22c9adef4d4e) --- .../src/android/platform/test/scenario/system/ScreenOff.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 1f5e23475..a2e1290c4 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 @@ public class ScreenOff { @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(); } -- cgit v1.2.3