diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2011-01-20 10:21:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-20 10:21:37 -0800 |
| commit | 080c237638a38c1bd2fa8d079cbbee0b5f23d956 (patch) | |
| tree | 5fde1849a256c2db1062b62bef088fd1bdd5a463 /cmds | |
| parent | eddcd1186b05b9b425ae765e98882a1815e3ac4d (diff) | |
| parent | bf86c3e1ce3dfea6f9f1b243f8509e78068b532c (diff) | |
| download | android_development-080c237638a38c1bd2fa8d079cbbee0b5f23d956.tar.gz android_development-080c237638a38c1bd2fa8d079cbbee0b5f23d956.tar.bz2 android_development-080c237638a38c1bd2fa8d079cbbee0b5f23d956.zip | |
Merge "Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736" into honeycomb
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/monkey/src/com/android/commands/monkey/Monkey.java | 3 |
1 files changed, 1 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 18cf19de9..fa752d78d 100644 --- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java +++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java @@ -337,9 +337,8 @@ public class Monkey { synchronized (Monkey.this) { mAbort = true; } - return (mKillProcessAfterError) ? -1 : 1; } - return 1; + return (mKillProcessAfterError) ? -1 : 1; } } |