commit 35cfedab5d90d19570f89bdf12b3d166b6ef0a8e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 18 17:14:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 18 17:14:14 2020 +0000
tree 22cab986532198e900e94d2ebe2b7fc5e416172f
parent 7d2209956506ccca386863526b00160739d11062
parent 05ca02bd1d2366c7a71d7a777f52820dacfa30b1

Merge "Disable automotive short notice for WM CTS tests"

tests/framework/base/windowmanager/AndroidTest.xml

diff --git a/tests/framework/base/windowmanager/AndroidTest.xml b/tests/framework/base/windowmanager/AndroidTest.xml
index e92c412..1f8818a 100644
--- a/tests/framework/base/windowmanager/AndroidTest.xml
+++ b/tests/framework/base/windowmanager/AndroidTest.xml
@@ -46,6 +46,13 @@
         <option name="test-file-name" value="CtsDragAndDropTargetAppSdk23.apk"/>
         <option name="test-file-name" value="CtsDeviceAlertWindowTestAppSdk25.apk"/>
     </target_preparer>
+    <!-- Necessary for Automotive devices - no-op for other Android verticals -->
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command"
+                value="settings put secure android.car.ENABLE_INITIAL_NOTICE_SCREEN_TO_USER 0" />
+        <option name="teardown-command"
+                value="settings put secure android.car.ENABLE_INITIAL_NOTICE_SCREEN_TO_USER 1" />
+    </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="android.server.wm.cts"/>
         <option name="runtime-hint" value="1h"/>