summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2011-01-14 19:25:11 -0800
committerYu Shan Emily Lau <yslau@google.com>2011-01-14 19:25:11 -0800
commitbf86c3e1ce3dfea6f9f1b243f8509e78068b532c (patch)
treed4a6f7e8e39a8f56a1121cce054f93e30e9b4176 /cmds
parent560094efef3da5f616faed00212f8fdae9037d99 (diff)
downloadandroid_development-bf86c3e1ce3dfea6f9f1b243f8509e78068b532c.tar.gz
android_development-bf86c3e1ce3dfea6f9f1b243f8509e78068b532c.tar.bz2
android_development-bf86c3e1ce3dfea6f9f1b243f8509e78068b532c.zip
Fixed the monkey option - killProcessAfterError is not beging checked in ANR. bug#3146736
Change-Id: I82dc5d28a218f8e2a6e7c13f27a4aca398cd904d
Diffstat (limited to 'cmds')
-rw-r--r--cmds/monkey/src/com/android/commands/monkey/Monkey.java3
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;
}
}