diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-05 01:10:22 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-05 01:10:22 +0000 |
commit | fe236714c46d8ae8e5775cb1f9d2a27cf680695b (patch) | |
tree | 0110f3f11d8da88aebe98cfa39a7a93c79c961ee | |
parent | 825f1469b18f181bf96946a1602b87cc26bdef70 (diff) | |
parent | 35f1e71c657ced63afa9a6e95ea5069fc3ab3b1a (diff) | |
download | catbox-android13-d1-s3-release.tar.gz |
Snap for 8404802 from 35f1e71c657ced63afa9a6e95ea5069fc3ab3b1a to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release
Change-Id: I14890c4aafb71782f546c990e1462d326a1d0d63
-rw-r--r-- | tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml | 4 | ||||
-rw-r--r-- | tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml | 2 |
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" /> |