Merge "Add wait time after broadcasting <Active Source> from adapter" into android12-tests-dev
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRemoteControlPassThroughTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRemoteControlPassThroughTest.java
index 7603845..2da326b 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRemoteControlPassThroughTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRemoteControlPassThroughTest.java
@@ -38,11 +38,14 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/** HDMI CEC test to check Remote Control Pass Through behaviour (Sections 11.1.13) */
@RunWith(DeviceJUnit4ClassRunner.class)
public final class HdmiCecRemoteControlPassThroughTest extends BaseHdmiCecCtsTest {
+ private static final int WAIT_TIME_MS = 300;
+
private HashMap<String, Integer> remoteControlKeys = new HashMap<String, Integer>();
private HashMap<String, Integer> remoteControlAudioKeys = new HashMap<String, Integer>();
@@ -76,6 +79,7 @@
*/
hdmiCecClient.broadcastActiveSource(
LogicalAddress.RECORDER_1, hdmiCecClient.getPhysicalAddress());
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME_MS);
}
}
@@ -89,6 +93,7 @@
public void cect_11_1_13_1_RemoteControlMessagesToRecorder() throws Exception {
hdmiCecClient.broadcastActiveSource(
LogicalAddress.RECORDER_1, hdmiCecClient.getPhysicalAddress());
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME_MS);
validateKeyeventToUserControlPress(LogicalAddress.RECORDER_1, remoteControlKeys);
}
@@ -102,6 +107,7 @@
public void cect_11_1_13_2_RemoteControlMessagesToPlayback() throws Exception {
hdmiCecClient.broadcastActiveSource(
LogicalAddress.PLAYBACK_1, hdmiCecClient.getPhysicalAddress());
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME_MS);
validateKeyeventToUserControlPress(LogicalAddress.PLAYBACK_1, remoteControlKeys);
}
@@ -115,6 +121,7 @@
public void cect_11_1_13_3_RemoteControlMessagesToTuner() throws Exception {
hdmiCecClient.broadcastActiveSource(
LogicalAddress.TUNER_1, hdmiCecClient.getPhysicalAddress());
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME_MS);
validateKeyeventToUserControlPress(LogicalAddress.TUNER_1, remoteControlKeys);
}
@@ -128,6 +135,7 @@
public void cect_11_1_13_4_RemoteControlMessagesToAudioSystem() throws Exception {
hdmiCecClient.broadcastActiveSource(
LogicalAddress.AUDIO_SYSTEM, hdmiCecClient.getPhysicalAddress());
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME_MS);
validateKeyeventToUserControlPress(LogicalAddress.AUDIO_SYSTEM, remoteControlAudioKeys);
}
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java
index e09ef22..bb60b4e 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java
@@ -39,6 +39,8 @@
@RunWith(DeviceJUnit4ClassRunner.class)
public final class HdmiCecRoutingControlTest extends BaseHdmiCecCtsTest {
+ private static final int WAIT_TIME_MS = 300;
+
@Rule
public RuleChain ruleChain =
RuleChain.outerRule(CecRules.requiresCec(this))
@@ -68,6 +70,7 @@
*/
hdmiCecClient.broadcastActiveSource(
hdmiCecClient.getSelfDevice(), hdmiCecClient.getPhysicalAddress());
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME_MS);
}
}
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvOneTouchPlayTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvOneTouchPlayTest.java
index 0b4b29e..206e592 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvOneTouchPlayTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvOneTouchPlayTest.java
@@ -122,6 +122,7 @@
*/
hdmiCecClient.broadcastActiveSource(
LogicalAddress.RECORDER_1, hdmiCecClient.getPhysicalAddress());
+ TimeUnit.MILLISECONDS.sleep(WAIT_TIME_MS);
}
// Make the TV device the active source.
HdmiControlManagerUtility.setActiveSource(