Revert "Add RebootTargetPreparer for tests that require root permission"
This reverts commit 37a894be37c12b60ba779597e6d0440d5d665626.
Reason for revert: ShellStatusChecker has been disabled for mainline test mapping suites
Change-Id: Icdea8a27d25afff198d20e4e73dbb6541f282278
diff --git a/resolv_test_config_template.xml b/resolv_test_config_template.xml
index f4a4413..e649970 100644
--- a/resolv_test_config_template.xml
+++ b/resolv_test_config_template.xml
@@ -21,13 +21,6 @@
<configuration description="Configuration for {MODULE} tests">
<option name="test-suite-tag" value="mts" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
-
- <!-- To avoid module rollbacks due to "adbd exits 4 times in 4 minutes" caused by repeated
- root/unroot, reboot the device to reset the crash counter in init service.
- See b/260180513 for more details.
- -->
- <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />
-
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.testutils.DisableConfigSyncTargetPreparer" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
diff --git a/tests/resolv_gold_test_config.xml b/tests/resolv_gold_test_config.xml
index 653c9c8..3c34d6c 100644
--- a/tests/resolv_gold_test_config.xml
+++ b/tests/resolv_gold_test_config.xml
@@ -16,13 +16,6 @@
<configuration description="Configuration for resolv gold tests">
<option name="test-suite-tag" value="mts" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
-
- <!-- To avoid module rollbacks due to "adbd exits 4 times in 4 minutes" caused by repeated
- root/unroot, reboot the device to reset the crash counter in init service.
- See b/260180513 for more details.
- -->
- <target_preparer class="com.android.tradefed.targetprep.RebootTargetPreparer" />
-
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
