diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-12-02 19:53:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-02 19:53:44 +0000 |
| commit | cd278c9a3c425f39baa3670dd65c0eecac669298 (patch) | |
| tree | caaa216d04330d434847203c58549504e46b2006 | |
| parent | c23f343890eecf12074fac603d5b369eb02e459f (diff) | |
| parent | 5179e1da366c13b99fbfa111c33be41cba21011b (diff) | |
| download | platform_tools_swt-studio-1.0-release.tar.gz platform_tools_swt-studio-1.0-release.tar.bz2 platform_tools_swt-studio-1.0-release.zip | |
Merge "Chimpchat: use shell timeout from DdmPreferences instead of hardcoding" into studio-1.0-releasestudio_1.0.1studio_1.0.0gradle_1.0.1gradle_1.0.0-rc4gradle_1.0.0-rc3gradle_1.0.0-rc2gradle_1.0.0studio-1.0-release
| -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 |