commit 9bf10f139d4f2454df66a82efb90442a9c4cf834
author Xavier Ducrohet <xav@google.com> Tue Dec 02 19:53:24 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 02 19:53:24 2014 +0000
tree caaa216d04330d434847203c58549504e46b2006
parent 41cf4cec9f4e470731f9004799a6faca7555e683
parent 06080ca7a376ae484c0589ebf415d876e42991b2

Merge "Chimpchat: use shell timeout from DdmPreferences instead of hardcoding" into studio-1.0-dev

chimpchat/src/main/java/com/android/chimpchat/adb/AdbChimpDevice.java

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.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 @@
 
     @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