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

resolved conflicts for merge of 494d8698 to master

Browse Source
This commit is contained in:
Ying Wang
2010-01-08 20:47:07 -08:00
parent 74192eafec 494d869844
commit 9a7ff5b7ce
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -870,7 +870,6 @@ public class Monkey {
MonkeyEvent ev = mEventSource.getNextEvent(); MonkeyEvent ev = mEventSource.getNextEvent();
if (ev != null) { if (ev != null) {
int injectCode = ev.injectEvent(mWm, mAm, mVerbose); int injectCode = ev.injectEvent(mWm, mAm, mVerbose);
if (injectCode == MonkeyEvent.INJECT_FAIL) { if (injectCode == MonkeyEvent.INJECT_FAIL) {
if (ev instanceof MonkeyKeyEvent) { if (ev instanceof MonkeyKeyEvent) {
@@ -882,8 +881,12 @@ public class Monkey {
} }
} else if (injectCode == MonkeyEvent.INJECT_ERROR_REMOTE_EXCEPTION) { } else if (injectCode == MonkeyEvent.INJECT_ERROR_REMOTE_EXCEPTION) {
systemCrashed = true; systemCrashed = true;
System.err.println("** Error: RemoteException while injecting event.");
} else if (injectCode == MonkeyEvent.INJECT_ERROR_SECURITY_EXCEPTION) { } else if (injectCode == MonkeyEvent.INJECT_ERROR_SECURITY_EXCEPTION) {
systemCrashed = !mIgnoreSecurityExceptions; systemCrashed = !mIgnoreSecurityExceptions;
if (systemCrashed) {
System.err.println("** Error: SecurityException while injecting event.");
}
} }
// Don't count throttling as an event. // Don't count throttling as an event.
@@ -897,11 +900,12 @@ public class Monkey {
if (!mCountEvents) { if (!mCountEvents) {
cycleCounter++; cycleCounter++;
} else { } else {
// Event Source has signaled that we have no more events to process
break; break;
} }
} }
} }
// If we got this far, we succeeded! System.out.println("Events injected: " + eventCounter);
return eventCounter; return eventCounter;
} }