resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp
Change-Id: I53302710ca0698daa5fe8ca3ce631a70d1578463
This commit is contained in:
@@ -404,6 +404,7 @@ public class Monkey {
|
|||||||
// Set ro.monkey if it's not set yet.
|
// Set ro.monkey if it's not set yet.
|
||||||
SystemProperties.set("ro.monkey", "true");
|
SystemProperties.set("ro.monkey", "true");
|
||||||
|
|
||||||
|
// Set the process name showing in "ps" or "top"
|
||||||
Process.setArgV0("com.android.commands.monkey");
|
Process.setArgV0("com.android.commands.monkey");
|
||||||
|
|
||||||
int resultCode = (new Monkey()).run(args);
|
int resultCode = (new Monkey()).run(args);
|
||||||
|
|||||||
Reference in New Issue
Block a user