summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 20:09:38 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-28 20:09:38 +0000
commit187bcc98a4b9aa68853656a0c2149016a61a6901 (patch)
tree0110f3f11d8da88aebe98cfa39a7a93c79c961ee
parent3c4348f9ce83133ba0e87fe3c25619ab56a11227 (diff)
parent5abeb03a64d1f6e517834368ac854f515a265fb9 (diff)
downloadcatbox-android13-mainline-go-adservices-release.tar.gz
Snap for 8505378 from 5abeb03a64d1f6e517834368ac854f515a265fb9 to mainline-go-adservices-releaseaml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-mainline-go-adservices-release
Change-Id: I172698fa377b8db3ebea75643cb6309b70cee695
-rw-r--r--tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml4
-rw-r--r--tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml2
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml b/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml
index 3eb46e3..b214a80 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml
@@ -34,5 +34,7 @@
<!-- Tests -->
<option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.DeleteCurrentNonAdminUser" />
<option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.SwitchToGuestFromNonAdmin" />
+<!--
<option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.DeleteLastAdminUser" />
-</configuration>
+-->
+</configuration> \ No newline at end of file
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml b/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml
index 921e626..a3d0d0e 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml
@@ -24,7 +24,7 @@
<option name="plan" value="catbox-functional-multiuser"/>
<!-- adb shell command specific to multiuser tests -->
- <option name="run-command:run-command" value="setprop fw.stop_bg_users_on_switch 0" />
+ <option name="run-command:run-command" value="cmd activity set-stop-user-on-switch false" />
<!-- Test Args -->
<option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:runner:androidx.test.runner.AndroidJUnitRunner" />