commit 1953868d1a929f1edb7c24cbd9e0ac30681ada3a
author Jack He <siyuanh@google.com> Thu Mar 30 04:24:04 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 30 04:24:04 2023 +0000
tree 41b7b06a0b66125a55e60b5c47becb7298f56e76
parent bb32f9bfbea118296441f09642ce07d9a83c1a8c
parent 9669b6f5a0d1d6dd8734c99f7a8d195214894abc

Merge "BluetoothCddTest: Verify CDD requirements in CTS"

hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecPowerStatusTest.java

diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecPowerStatusTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecPowerStatusTest.java
index 3ca4ee0..bf7f985 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecPowerStatusTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecPowerStatusTest.java
@@ -33,7 +33,6 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -138,13 +137,9 @@
             // Turn device off
             sendDeviceToSleep();
 
-            List<Integer> keycodes = new ArrayList<>();
-            keycodes.add(HdmiCecConstants.CEC_KEYCODE_POWER_ON_FUNCTION);
-            keycodes.add(HdmiCecConstants.CEC_KEYCODE_POWER_OFF_FUNCTION);
-
-            // Send a <UCP>[Power On] immediately followed by a <UCP>[Power Off]
-            hdmiCecClient.sendMultipleUserControlPressAndRelease(
-                    hdmiCecClient.getSelfDevice(), keycodes);
+            device.executeShellCommand("input keyevent KEYCODE_WAKEUP");
+            TimeUnit.MILLISECONDS.sleep(200);
+            device.executeShellCommand("input keyevent KEYCODE_SLEEP");
 
             String reportPowerStatus =
                     hdmiCecClient.checkExpectedOutput(CecOperand.REPORT_POWER_STATUS);
@@ -198,13 +193,9 @@
             wakeUpDevice();
             WakeLockHelper.acquirePartialWakeLock(getDevice());
 
-            List<Integer> keycodes = new ArrayList<>();
-            keycodes.add(HdmiCecConstants.CEC_KEYCODE_POWER_OFF_FUNCTION);
-            keycodes.add(HdmiCecConstants.CEC_KEYCODE_POWER_ON_FUNCTION);
-
-            // Send a <UCP>[Power Off] immediately followed by a <UCP>[Power On]
-            hdmiCecClient.sendMultipleUserControlPressAndRelease(
-                    hdmiCecClient.getSelfDevice(), keycodes);
+            device.executeShellCommand("input keyevent KEYCODE_SLEEP");
+            TimeUnit.MILLISECONDS.sleep(200);
+            device.executeShellCommand("input keyevent KEYCODE_WAKEUP");
 
             String reportPowerStatus =
                     hdmiCecClient.checkExpectedOutput(CecOperand.REPORT_POWER_STATUS);