diff options
| author | The Android Automerger <android-build@android.com> | 2011-01-24 23:45:43 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2011-01-24 23:45:43 -0800 |
| commit | 902bc7bcea710d4698ce571ac3042a5338fc94e1 (patch) | |
| tree | 7a69d828f1842e70c85481e0ed0c576d4c2dd09b /cmds | |
| parent | 8ae584edb2d0349ce42b775de795d9d35761f2da (diff) | |
| parent | 42f87e1b4738635a024b7492cf18ede26d3c5d5d (diff) | |
| download | android_development-902bc7bcea710d4698ce571ac3042a5338fc94e1.tar.gz android_development-902bc7bcea710d4698ce571ac3042a5338fc94e1.tar.bz2 android_development-902bc7bcea710d4698ce571ac3042a5338fc94e1.zip | |
resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp
Change-Id: Ic0ea8910670567e1725e42de76e6da0cd09decac
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/monkey/src/com/android/commands/monkey/Monkey.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java index d95a41bf8..1e061ea11 100644 --- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java +++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java @@ -337,8 +337,9 @@ public class Monkey { synchronized (Monkey.this) { mAbort = true; } + return (mKillProcessAfterError) ? -1 : 0; } - return (mKillProcessAfterError) ? -1 : 1; + return 0; } } |