summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-18 16:49:39 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-18 16:49:39 +0000
commitf624f44662cd4446ca420295d931fa56ec55d9a4 (patch)
treede3129d8b6a0b0826d06b12033399bac55489dda
parente1e6aa5cfb5333b896d53313d1677eda98583923 (diff)
parent08056a170ce375185a84f30144d2365c30550971 (diff)
downloadcts-f624f44662cd4446ca420295d931fa56ec55d9a4.tar.gz
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24076754'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: I20a4708710842271c0958e8acd2fe9de8c6e3e55 Change-Id: I103d00d65d129b4e16b0eb93d1ba6b03737d1485
-rw-r--r--tests/input/AndroidTest.xml1
-rw-r--r--tests/tests/hardware/AndroidTest.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/input/AndroidTest.xml b/tests/input/AndroidTest.xml
index 41af3398a80..4635981b5cb 100644
--- a/tests/input/AndroidTest.xml
+++ b/tests/input/AndroidTest.xml
@@ -38,5 +38,6 @@
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<!-- TODO(b/285554134): Remove once underlying issue is fixed-->
<option name="run-command" value="wm set-ignore-orientation-request false" />
+ <option name="run-command" value="wm set-letterbox-style --isEducationEnabled false" />
</target_preparer>
</configuration>
diff --git a/tests/tests/hardware/AndroidTest.xml b/tests/tests/hardware/AndroidTest.xml
index 32f4a99d3f3..5568809caec 100644
--- a/tests/tests/hardware/AndroidTest.xml
+++ b/tests/tests/hardware/AndroidTest.xml
@@ -38,5 +38,6 @@
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<!-- TODO(b/285554134): Remove once underlying issue is fixed-->
<option name="run-command" value="wm set-ignore-orientation-request false" />
+ <option name="run-command" value="wm set-letterbox-style --isEducationEnabled false" />
</target_preparer>
</configuration>