diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-12-02 19:53:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-02 19:53:24 +0000 |
| commit | 9bf10f139d4f2454df66a82efb90442a9c4cf834 (patch) | |
| tree | caaa216d04330d434847203c58549504e46b2006 | |
| parent | 41cf4cec9f4e470731f9004799a6faca7555e683 (diff) | |
| parent | 06080ca7a376ae484c0589ebf415d876e42991b2 (diff) | |
| download | platform_tools_swt-studio-1.0-dev.tar.gz platform_tools_swt-studio-1.0-dev.tar.bz2 platform_tools_swt-studio-1.0-dev.zip | |
Merge "Chimpchat: use shell timeout from DdmPreferences instead of hardcoding" into studio-1.0-devstudio-1.0-dev
| -rw-r--r-- | chimpchat/src/main/java/com/android/chimpchat/adb/AdbChimpDevice.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chimpchat/src/main/java/com/android/chimpchat/adb/AdbChimpDevice.java b/chimpchat/src/main/java/com/android/chimpchat/adb/AdbChimpDevice.java index 70d76c4..2b9681c 100644 --- a/chimpchat/src/main/java/com/android/chimpchat/adb/AdbChimpDevice.java +++ b/chimpchat/src/main/java/com/android/chimpchat/adb/AdbChimpDevice.java @@ -21,6 +21,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.android.ddmlib.AdbCommandRejectedException; +import com.android.ddmlib.DdmPreferences; import com.android.ddmlib.IDevice; import com.android.ddmlib.InstallException; import com.android.ddmlib.ShellCommandUnresponsiveException; @@ -263,9 +264,7 @@ public class AdbChimpDevice implements IChimpDevice { @Override public String shell(String cmd) { - // 5000 is the default timeout from the ddmlib. - // This timeout arg is needed to the backwards compatibility. - return shell(cmd, 5000); + return shell(cmd, DdmPreferences.getTimeOut()); } @Override |