am 8ad7359b: Merge "Replace use of ro.monkey with ro.test_harness." into honeycomb

* commit '8ad7359b2f61d0be4bfca700393179e61c8d68a4':
  Replace use of ro.monkey with ro.test_harness.

cmds/monkey/src/com/android/commands/monkey/Monkey.java

@@ -452,9 +452,6 @@ public class Monkey {
      * @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");
 

testrunner/adb_interface.py

@@ -465,7 +465,7 @@ class AdbInterface:
     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)

tools/labpretest/labpretest.sh

@@ -531,8 +531,8 @@ for ((loop=1 ; loop <= $COUNT ; loop++ )) ; do
   #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)