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

Fix MonkeyRunner to use the changed ddmlib API.

Browse Source 
Change-Id: Ia56612bf700e360f77dd9e13c0bc74eac59e30ea
This commit is contained in:
Xavier Ducrohet
2010-07-15 17:44:56 -07:00
parent 38675e8073
commit b8f2aa9ff1
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/monkeyrunner/src/com/android/monkeyrunner/adb/AdbMonkeyDevice.java
View File

@@ -20,6 +20,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.android.ddmlib.IDevice; import com.android.ddmlib.IDevice;
import com.android.ddmlib.TimeoutException;
import com.android.ddmlib.AdbCommandRejectedException;
import com.android.monkeyrunner.MonkeyDevice; import com.android.monkeyrunner.MonkeyDevice;
import com.android.monkeyrunner.MonkeyImage; import com.android.monkeyrunner.MonkeyImage;
import com.android.monkeyrunner.MonkeyManager; import com.android.monkeyrunner.MonkeyManager;
@@ -89,7 +91,19 @@ public class AdbMonkeyDevice extends MonkeyDevice {
} }
private MonkeyManager createManager(String address, int port) { private MonkeyManager createManager(String address, int port) {
device.createForward(port, port); try {
device.createForward(port, port);
} catch (TimeoutException e) {
LOG.log(Level.SEVERE, "Timeout creating adb port forwarding", e);
return null;
} catch (AdbCommandRejectedException e) {
LOG.log(Level.SEVERE, "Adb rejected adb port forwarding command: " + e.getMessage(), e);
return null;
} catch (IOException e) {
LOG.log(Level.SEVERE, "Unable to create adb port forwarding: " + e.getMessage(), e);
return null;
}
String command = "monkey --port " + port; String command = "monkey --port " + port;
executeAsyncCommand(command, new LoggingOutputReceiver(LOG, Level.FINE)); executeAsyncCommand(command, new LoggingOutputReceiver(LOG, Level.FINE));