diff options
| author | Julien Desprez <jdesprez@google.com> | 2024-04-03 13:56:34 -0700 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2024-04-05 19:53:57 +0000 |
| commit | bfe19a7f02f7667748814af27946f1cffc60bb65 (patch) | |
| tree | f162b0b02c52674fabd60fb99dd33f9348dc380b | |
| parent | 14de88f4e11881bf93cd1b38b9710905d4002908 (diff) | |
| download | tradefederation-bfe19a7f02f7667748814af27946f1cffc60bb65.tar.gz | |
Convert some of the stayon command to shellV2
Test: presubmit
Bug: 329536875
Change-Id: Ic919c5c2038b222eb276dc81479b3cfe06a1f972
| -rw-r--r-- | src/com/android/tradefed/targetprep/DeviceSetup.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/tradefed/targetprep/DeviceSetup.java b/src/com/android/tradefed/targetprep/DeviceSetup.java index 690b2c72d..a917f7736 100644 --- a/src/com/android/tradefed/targetprep/DeviceSetup.java +++ b/src/com/android/tradefed/targetprep/DeviceSetup.java @@ -1053,13 +1053,16 @@ public class DeviceSetup extends BaseTargetPreparer implements IExternalDependen try (CloseableTraceScope ignored = new CloseableTraceScope(InvocationMetricKey.screen_on_setup.toString())) { CLog.d("Setting screen always on to true"); - device.executeShellCommand(String.format(cmd, "true")); + String cmdStayOn = String.format(cmd, "true"); + CommandResult stayOn = device.executeShellV2Command(cmdStayOn); + CLog.d("%s output: %s", cmdStayOn, stayOn); if (mDismissViaWm) { CommandResult res = device.executeShellV2Command("wm dismiss-keyguard"); CLog.d("Output of dismiss-keyguard: %s", res); } else { // send MENU press in case keyguard needs to be dismissed again - device.executeShellCommand("input keyevent 82"); + CommandResult inputKey = device.executeShellV2Command("input keyevent 82"); + CLog.d("Output of input keyevent 82: %s", inputKey); } // send HOME press in case keyguard was already dismissed, so we bring device // back @@ -1068,7 +1071,8 @@ public class DeviceSetup extends BaseTargetPreparer implements IExternalDependen // instead of the home screen if ((device instanceof TestDevice) && !device.hasFeature("android.hardware.type.watch")) { - device.executeShellCommand("input keyevent 3"); + CommandResult inputKey = device.executeShellV2Command("input keyevent 3"); + CLog.d("Output of input keyevent 3: %s", inputKey); } break; } |