diff options
| author | Dianne Hackborn <hackbod@android.com> | 2011-01-22 11:52:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-22 11:52:53 -0800 |
| commit | 42f87e1b4738635a024b7492cf18ede26d3c5d5d (patch) | |
| tree | 88ae76880d5a0f1874b8796062d62e2791e1b23e /cmds | |
| parent | 1717afbca4361cc190d3a3098c4ffce6ddb443f0 (diff) | |
| parent | e635484562dc7f21aa16de3147a100210708c8f8 (diff) | |
| download | android_development-42f87e1b4738635a024b7492cf18ede26d3c5d5d.tar.gz android_development-42f87e1b4738635a024b7492cf18ede26d3c5d5d.tar.bz2 android_development-42f87e1b4738635a024b7492cf18ede26d3c5d5d.zip | |
am e6354845: Merge "Monkey: request am to show the ANR dialog"
* commit 'e635484562dc7f21aa16de3147a100210708c8f8':
Monkey: request am to show the ANR dialog
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/monkey/src/com/android/commands/monkey/Monkey.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java index 68fb2a551..a1f306090 100644 --- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java +++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java @@ -337,9 +337,9 @@ public class Monkey { synchronized (Monkey.this) { mAbort = true; } - return (mKillProcessAfterError) ? -1 : 1; + return (mKillProcessAfterError) ? -1 : 0; } - return 1; + return 0; } } |