am 902bc7bc: resolved conflicts for merge of 42f87e1b to honeycomb-plus-aosp

* commit '902bc7bcea710d4698ce571ac3042a5338fc94e1': Monkey: request am to show the ANR dialog
2011-01-24 23:48:04 -08:00
parent d2d33e1f48 902bc7bcea
commit 4da6559883
1 changed files with 2 additions and 1 deletions
--- 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;
        }
    }