LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '902bc7bcea710d4698ce571ac3042a5338fc94e1':
  Monkey: request am to show the ANR dialog
This commit is contained in:
The Android Automerger
2011-01-24 23:48:04 -08:00
committed by Android Git Automerger
parent d2d33e1f48 902bc7bcea
commit 4da6559883
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/monkey/src/com/android/commands/monkey/Monkey.java
View File

@@ -337,8 +337,9 @@ public class Monkey {
synchronized (Monkey.this) { synchronized (Monkey.this) {
mAbort = true; mAbort = true;
} }
return (mKillProcessAfterError) ? -1 : 0;
} }
return (mKillProcessAfterError) ? -1 : 1; return 0;
} }
} }