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

resolved conflicts for merge of e3b115d0 to master

Browse Source
This commit is contained in:
Ying Wang
2010-01-04 13:37:36 -08:00
parent 8cb8766744 e3b115d0e6
commit 60dc137675
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import android.os.Debug;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties;
import android.view.IWindowManager; import android.view.IWindowManager;
import java.io.BufferedReader; import java.io.BufferedReader;
@@ -336,6 +337,15 @@ public class Monkey {
* @param args The command-line arguments * @param args The command-line arguments
*/ */
public static void main(String[] args) { public static void main(String[] args) {
// Tell the system that Monkey is running.
SystemProperties.set("monkey.running", "true");
// Add a hook to tell the system that Monkey has finished running.
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
SystemProperties.set("monkey.running", null);
}
});
int resultCode = (new Monkey()).run(args); int resultCode = (new Monkey()).run(args);
System.exit(resultCode); System.exit(resultCode);
} }