commit 560ed56c306262454b41a7d8dd29d33023ca1857
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 14 12:31:45 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 14 12:31:45 2024 +0000
tree 85085b424866c5ddf30abab4cf8f0b7d3ab990ad
parent b048fc29cd0ebc27de62b637464bd28e11511000
parent 37fd38931f6eb2f18bf664ef1af1ffce7a99fdcb

Merge "Add "cts-root" test_suite to bionic root tests" into main am: 37fd38931f

Original change: https://android-review.googlesource.com/c/platform/test/cts-root/+/2958273

Change-Id: I57de1945985a12c38008f840d5e26e5248ec7169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

hostsidetests/rollback/AndroidTest.xml

diff --git a/hostsidetests/rollback/AndroidTest.xml b/hostsidetests/rollback/AndroidTest.xml
index 35e7cda..89fd419 100644
--- a/hostsidetests/rollback/AndroidTest.xml
+++ b/hostsidetests/rollback/AndroidTest.xml
@@ -24,6 +24,10 @@
         <option name="test-file-name" value="CtsRootRollbackManagerHostTestHelperApp.apk" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+        <option name="auto-update-time" value="OFF"/>
+        <option name="auto-update-timezone" value="OFF"/>
+    </target_preparer>
     <test class="com.android.tradefed.testtype.HostTest" >
         <option name="class" value="com.android.cts_root.rollback.host.RollbackManagerHostTest" />
     </test>