diff options
| author | Ying Wang <wangying@google.com> | 2010-10-07 14:59:03 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-10-07 14:59:03 -0700 |
| commit | cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd (patch) | |
| tree | 1b84129a0dc81da7674e24411cfbcf57b61c9819 /cmds | |
| parent | a3088c433ed5deb775d390f2b22df40dc0194950 (diff) | |
| parent | de14fbd4b15937058889a7b33ede311850b44853 (diff) | |
| download | android_development-cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd.tar.gz android_development-cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd.tar.bz2 android_development-cbe0d5b963122c3cd0d7d2b8404c3bffd0b823fd.zip | |
resolved conflicts for merge of de14fbd4 to gingerbread-plus-aosp
Change-Id: I53302710ca0698daa5fe8ca3ce631a70d1578463
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/monkey/src/com/android/commands/monkey/Monkey.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java index 9e6651703..241baf768 100644 --- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java +++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java @@ -404,6 +404,7 @@ public class Monkey { // 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"); int resultCode = (new Monkey()).run(args); |