Revert "Use RunHostCommandTargetPreparer to enable TAPL"
This reverts commit e7e97b72742675ef7139768349ca40d4c5eb4b18.
Reason for revert: While this command works locally (atest) on all build types, it does not work when multiple devices are simultaneously connected to the computer
Change-Id: I9744d02f0eafe2fef3076c62cd07a8cac05546da
diff --git a/tests/FlickerTests/AndroidTest.xml b/tests/FlickerTests/AndroidTest.xml
index 37ee0ae2..d83ee3a 100644
--- a/tests/FlickerTests/AndroidTest.xml
+++ b/tests/FlickerTests/AndroidTest.xml
@@ -13,12 +13,8 @@
<option name="run-command" value="cmd window tracing level all" />
<!-- inform WM to log all transactions -->
<option name="run-command" value="cmd window tracing transaction" />
- </target_preparer>
- <target_preparer class="com.android.tradefed.targetprep.RunHostCommandTargetPreparer" >
- <!-- Prevent TAPL error for Nexus Launcher (http://go/tapl) -->
- <option name="host-setup-command" value="adb root" />
- <option name="host-setup-command" value="adb shell setprop ro.test_harness 1" />
- <option name="host-setup-command" value="adb shell am force-stop com.google.android.apps.nexuslauncher" />
+ <!-- restart launcher to activate TAPL -->
+ <option name="run-command" value="setprop ro.test_harness 1 ; am force-stop com.google.android.apps.nexuslauncher" />
</target_preparer>
<target_preparer class="com.android.tradefed.targetprep.DeviceCleaner">
<!-- reboot the device to teardown any crashed tests -->