Replace use of ro.monkey with ro.test_harness.
Bug 3329873
Change-Id: Ia681803c3d0b0afeceb178b8314c9d7227d99355
diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
index 2f14a26..18cf19d 100644
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -452,9 +452,6 @@
* @param args The command-line arguments
*/
public static void main(String[] args) {
- // Set ro.monkey if it's not set yet.
- SystemProperties.set("ro.monkey", "true");
-
// Set the process name showing in "ps" or "top"
Process.setArgV0("com.android.commands.monkey");
@@ -551,13 +548,13 @@
mCountEvents = false;
} else if (mScriptFileNames != null && mScriptFileNames.size() > 1) {
if (mSetupFileName != null) {
- mEventSource = new MonkeySourceRandomScript(mSetupFileName,
+ mEventSource = new MonkeySourceRandomScript(mSetupFileName,
mScriptFileNames, mThrottle, mRandomizeThrottle, mRandom,
mProfileWaitTime, mDeviceSleepTime, mRandomizeScript);
mCount++;
} else {
mEventSource = new MonkeySourceRandomScript(mScriptFileNames,
- mThrottle, mRandomizeThrottle, mRandom,
+ mThrottle, mRandomizeThrottle, mRandom,
mProfileWaitTime, mDeviceSleepTime, mRandomizeScript);
}
mEventSource.setVerbose(mVerbose);
diff --git a/testrunner/adb_interface.py b/testrunner/adb_interface.py
index 1928c73..3bd4396 100755
--- a/testrunner/adb_interface.py
+++ b/testrunner/adb_interface.py
@@ -465,7 +465,7 @@
output = ""
error = None
if runtime_restart:
- self.SendShellCommand("setprop ro.monkey 1", retry_count=retry_count)
+ self.SendShellCommand("setprop ro.test_harness 1", retry_count=retry_count)
# manual rest bootcomplete flag
self.SendShellCommand("setprop dev.bootcomplete 0",
retry_count=retry_count)
diff --git a/tools/labpretest/labpretest.sh b/tools/labpretest/labpretest.sh
index 62238f0..5db7960 100755
--- a/tools/labpretest/labpretest.sh
+++ b/tools/labpretest/labpretest.sh
@@ -531,8 +531,8 @@
#preping device for monkey run
log_print "setting adb root"
adb_command root
- log_print "setting ro.monkey property"
- adb_command shell setprop ro.monkey 1
+ log_print "setting ro.test_harness property"
+ adb_command shell setprop ro.test_harness 1
log_print "waiting for device to finish booting"
result=$($ADB -s $device shell getprop dev.bootcomplete)