Replace use of ro.monkey with ro.test_harness.
Bug 3329873 Change-Id: Ia681803c3d0b0afeceb178b8314c9d7227d99355
This commit is contained in:
@@ -452,9 +452,6 @@ public class Monkey {
|
|||||||
* @param args The command-line arguments
|
* @param args The command-line arguments
|
||||||
*/
|
*/
|
||||||
public static void main(String[] args) {
|
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"
|
// Set the process name showing in "ps" or "top"
|
||||||
Process.setArgV0("com.android.commands.monkey");
|
Process.setArgV0("com.android.commands.monkey");
|
||||||
|
|
||||||
|
|||||||
@@ -465,7 +465,7 @@ class AdbInterface:
|
|||||||
output = ""
|
output = ""
|
||||||
error = None
|
error = None
|
||||||
if runtime_restart:
|
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
|
# manual rest bootcomplete flag
|
||||||
self.SendShellCommand("setprop dev.bootcomplete 0",
|
self.SendShellCommand("setprop dev.bootcomplete 0",
|
||||||
retry_count=retry_count)
|
retry_count=retry_count)
|
||||||
|
|||||||
@@ -531,8 +531,8 @@ for ((loop=1 ; loop <= $COUNT ; loop++ )) ; do
|
|||||||
#preping device for monkey run
|
#preping device for monkey run
|
||||||
log_print "setting adb root"
|
log_print "setting adb root"
|
||||||
adb_command root
|
adb_command root
|
||||||
log_print "setting ro.monkey property"
|
log_print "setting ro.test_harness property"
|
||||||
adb_command shell setprop ro.monkey 1
|
adb_command shell setprop ro.test_harness 1
|
||||||
|
|
||||||
log_print "waiting for device to finish booting"
|
log_print "waiting for device to finish booting"
|
||||||
result=$($ADB -s $device shell getprop dev.bootcomplete)
|
result=$($ADB -s $device shell getprop dev.bootcomplete)
|
||||||
|
|||||||
Reference in New Issue
Block a user