commit 85809fd0abdb0d186101066f01264d0b61935e84
author Julien Desprez <jdesprez@google.com> Tue Apr 21 15:31:13 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 21 15:31:13 2020 +0000
tree a2db46e29c63334956fafc12310c9d41c6afdb8d
parent d7e3addc7a6725da8184afb789b8dcb6a32e0c95
parent 41915bcde2da3e4de5ede2b2e378ad4d0fee78f9

Merge "Log the adb devices output when device goes offline"

src/com/android/tradefed/device/DeviceManager.java

diff --git a/src/com/android/tradefed/device/DeviceManager.java b/src/com/android/tradefed/device/DeviceManager.java
index 7e08c4f..a653c1e 100644
--- a/src/com/android/tradefed/device/DeviceManager.java
+++ b/src/com/android/tradefed/device/DeviceManager.java
@@ -916,7 +916,7 @@
      * @return std output if the command succeedm null otherwise.
      */
     public String executeGlobalAdbCommand(String... cmdArgs) {
-        String[] fullCmd = ArrayUtil.buildArray(new String[] {"adb"}, cmdArgs);
+        String[] fullCmd = ArrayUtil.buildArray(new String[] {getAdbPath()}, cmdArgs);
         CommandResult result = getRunUtil().runTimedCmd(FASTBOOT_CMD_TIMEOUT, fullCmd);
         if (CommandStatus.SUCCESS.equals(result.getStatus())) {
             return result.getStdout();

src/com/android/tradefed/invoker/TestInvocation.java

diff --git a/src/com/android/tradefed/invoker/TestInvocation.java b/src/com/android/tradefed/invoker/TestInvocation.java
index fdd0a4b..0efc7a4 100644
--- a/src/com/android/tradefed/invoker/TestInvocation.java
+++ b/src/com/android/tradefed/invoker/TestInvocation.java
@@ -26,6 +26,7 @@
 import com.android.tradefed.config.DynamicRemoteFileResolver;
 import com.android.tradefed.config.GlobalConfiguration;
 import com.android.tradefed.config.IConfiguration;
+import com.android.tradefed.device.DeviceManager;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.DeviceUnresponsiveException;
 import com.android.tradefed.device.FreeDeviceState;
@@ -1059,6 +1060,12 @@
         }
         if (countPhysicalLost > 0) {
             addInvocationMetric(InvocationMetricKey.DEVICE_LOST_DETECTED, countPhysicalLost);
+            if (GlobalConfiguration.getDeviceManagerInstance() instanceof DeviceManager) {
+                String adbOutput =
+                        ((DeviceManager) GlobalConfiguration.getDeviceManagerInstance())
+                                .executeGlobalAdbCommand("devices");
+                CLog.e("'adb devices' output:\n%s", adbOutput);
+            }
         }
         return devicesStates;
     }