diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-31 02:04:44 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-31 02:04:44 +0000 |
| commit | 45fd9ff1446a855451355b627d09c446f53f883f (patch) | |
| tree | ef073d98d6ac2183e130604f0e9adc4b5f5747a6 | |
| parent | 47f5497a434f2484125c7cd5605f553c8e1939ba (diff) | |
| parent | 49ecda915a42413fa9debe3d9deec24c551edd79 (diff) | |
| download | platform_testing-45fd9ff1446a855451355b627d09c446f53f883f.tar.gz | |
Snap for 6171969 from 49ecda915a42413fa9debe3d9deec24c551edd79 to qt-qpr3-release
Change-Id: I4bd6af1bfe371f87daaedc7c7c392c9c20a2e8ea
| -rw-r--r-- | tests/health/scenarios/src/android/platform/test/scenario/system/ScreenOff.java | 5 |
1 files changed, 4 insertions, 1 deletions
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(); } |