Revert "Add some target preparers and add tests"

This reverts commit bcff3fdb8cf4eff1035261dee2b09d6af502de80.

Test: m google-tradefed-all

Change-Id: I66c5a7b0cd32f4ee8fd6c9193602333153ab495d

2 files changed, 0 insertions, 94 deletions

diff --git a/src/com/android/tradefed/targetprep/RebootTargetPreparer.java b/src/com/android/tradefed/targetprep/RebootTargetPreparer.java
deleted file mode 100644
index fb7f3f0..0000000
--- a/src/com/android/tradefed/targetprep/RebootTargetPreparer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tradefed.targetprep;
-
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.config.OptionClass;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-
-@OptionClass(alias = "reboot")
-public class RebootTargetPreparer implements ITargetPreparer {
-    @Override
-    public void setUp(ITestDevice device, IBuildInfo buildInfo)
-            throws TargetSetupError, BuildError, DeviceNotAvailableException {
-        device.reboot();
-    }
-}
diff --git a/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java b/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java
deleted file mode 100644
index 11d7fba..0000000
--- a/src/com/android/tradefed/targetprep/RestartSystemServerTargetPreparer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tradefed.targetprep;
-
-import com.android.tradefed.build.IBuildInfo;
-import com.android.tradefed.config.Option;
-import com.android.tradefed.config.OptionClass;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.util.IRunUtil;
-import com.android.tradefed.util.RunUtil;
-
-@OptionClass(alias = "restart-system-server")
-public class RestartSystemServerTargetPreparer implements ITargetPreparer {
-    @Option(name = "poll-interval-millis",
-            description = "Time interval to poll if system server has restarted")
-    private long mPollIntervalMillis = 3000L;
-    @Option(name = "max-tries",
-            description = "Max number of tries to poll")
-    private int mMaxTries = 10;
-
-    private IRunUtil mRunUtil;
-
-    public RestartSystemServerTargetPreparer() {
-        this(RunUtil.getDefault());
-    }
-
-    public RestartSystemServerTargetPreparer(IRunUtil runUtil) {
-        this.mRunUtil = runUtil;
-    }
-
-    @Override
-    public void setUp(ITestDevice device, IBuildInfo buildInfo)
-            throws TargetSetupError, BuildError, DeviceNotAvailableException {
-        device.executeShellCommand("setprop sys.boot_completed 0");
-        String pid = device.executeShellCommand("pidof system_server");
-        device.executeShellCommand("kill " + pid);
-        boolean success = false;
-        for (int tries = 0; tries < mMaxTries; ++tries) {
-            if (device.executeShellCommand("getprop sys.boot_completed").equals("1")) {
-                success = true;
-                break;
-            }
-            mRunUtil.sleep(mPollIntervalMillis);
-        }
-        if (!success) {
-            throw new TargetSetupError("Gave up on waiting for system server to restart",
-                    device.getDeviceDescriptor());
-        }
-    }
-}