Merge change 21988 into donut
* changes:
Add OS version to ping service (win/mac only)
diff --git a/tools/monkeyrunner/src/com/android/monkeyrunner/MonkeyRunner.java b/tools/monkeyrunner/src/com/android/monkeyrunner/MonkeyRunner.java
index 3d51615..cbc881c 100644
--- a/tools/monkeyrunner/src/com/android/monkeyrunner/MonkeyRunner.java
+++ b/tools/monkeyrunner/src/com/android/monkeyrunner/MonkeyRunner.java
@@ -45,8 +45,8 @@
*/
public class MonkeyRunner {
- static String monkeyServer = null;
- static int monkeyPort;
+ static String monkeyServer = "127.0.0.1";
+ static int monkeyPort = 1080;
static Socket monkeySocket = null;
static IDevice monkeyDevice;
@@ -62,7 +62,7 @@
public static void main(String[] args) {
processOptions(args);
-
+
initAdbConnection();
openMonkeyConnection();
@@ -150,9 +150,13 @@
monkeyDevice = devices[0];
}
- } finally {
- }
+ monkeyDevice.createForward(monkeyPort, monkeyPort);
+ String command = "monkey --port " + monkeyPort;
+ monkeyDevice.executeShellCommand(command, new NullOutputReceiver());
+ } catch(IOException e) {
+ e.printStackTrace();
+ }
}
/**