From 5fed4740204407fd99da6ad4b331ee825c7333e9 Mon Sep 17 00:00:00 2001 From: Syaoran Kuo Date: Tue, 28 Sep 2021 15:32:40 +0800 Subject: [PATCH] Use power manager instead of adb to wake up screen. Fix this before merger back from sc-v2, to prevent merge conflict. Bug: 201253586 Test: atest SettingsComponentTests Change-Id: I08871e744e201a10ddbfdf41e3a40df8c65b9865 --- .../src/com/android/settings/testutils/CommonUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/componenttests/src/com/android/settings/testutils/CommonUtils.java b/tests/componenttests/src/com/android/settings/testutils/CommonUtils.java index e3114c89b75..49da1601a22 100644 --- a/tests/componenttests/src/com/android/settings/testutils/CommonUtils.java +++ b/tests/componenttests/src/com/android/settings/testutils/CommonUtils.java @@ -139,7 +139,7 @@ public class CommonUtils { UiUtils.waitUntilCondition(1000, () -> sPowerManager.isInteractive()); // After power on screen, need to unlock and goto home page. - AdbUtils.shell("input keyevent KEYCODE_MENU"); + sPowerManager.wakeUp(1000, PowerManager.WAKE_REASON_POWER_BUTTON, "Wakeup"); } /**