am 19e2f60e: am 9c7692aa: Set ro.monkey if it\'s not set yet.

Merge commit '19e2f60e4f850661342ff24a87c11f81cb2f2dea'

* commit '19e2f60e4f850661342ff24a87c11f81cb2f2dea':
  Set ro.monkey if it's not set yet.
This commit is contained in:
Ying Wang
2010-01-06 13:56:06 -08:00
committed by Android Git Automerger

View File

@@ -337,14 +337,8 @@ public class Monkey {
* @param args The command-line arguments
*/
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);
}
});
// Set ro.monkey if it's not set yet.
SystemProperties.set("ro.monkey", "true");
int resultCode = (new Monkey()).run(args);
System.exit(resultCode);