CEC: Fix cect_GiveSystemAudioModeStatus test
While waiting for <REPORT_POWER_STATUS> message, we were discarding
the <GIVE_SYSTEM_AUDIO_STATUS> message received from device.
So instead of waiting for transition just validate wakefullness.
Bug: 218500266
Test: atest HdmiCecSystemAudioControlTest#cect_GiveSystemAudioModeStatus
Change-Id: Ifeefc1b51314b17356dd588dc5e7d96e3b1860d4
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java
index f4c89e8..f5a6454 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java
@@ -467,6 +467,13 @@
WakeLockHelper.releasePartialWakeLock(device);
}
+ public void wakeUpDeviceWithoutWait() throws Exception {
+ ITestDevice device = getDevice();
+ device.executeShellCommand("input keyevent KEYCODE_WAKEUP");
+ assertDeviceWakefulness(HdmiCecConstants.WAKEFULNESS_AWAKE);
+ WakeLockHelper.releasePartialWakeLock(device);
+ }
+
public void checkStandbyAndWakeUp() throws Exception {
assertDeviceWakefulness(HdmiCecConstants.WAKEFULNESS_ASLEEP);
wakeUpDevice();
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemAudioControlTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemAudioControlTest.java
index 0eebc18..c95a8a2 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemAudioControlTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemAudioControlTest.java
@@ -156,7 +156,7 @@
/* Home Key to prevent device from going to deep suspend state */
device.executeShellCommand("input keyevent KEYCODE_HOME");
sendDeviceToSleep();
- wakeUpDevice();
+ wakeUpDeviceWithoutWait();
hdmiCecClient.checkExpectedOutput(
hdmiCecClient.getSelfDevice(), CecOperand.GIVE_SYSTEM_AUDIO_MODE_STATUS);
}
