commit 17b7a24ed8756fc6f3a57bd08e26b60aeb33f5d0
author Julien Desprez <jdesprez@google.com> Tue Mar 24 15:35:48 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 24 15:35:48 2020 +0000
tree b9a02881f8185ebca039a1fe12f6fd9e1c230552
parent 661fb22dbd62d8a65aa876cfbdcfaf3c1af47b1a
parent 2c0bf3113508dfb238ae9753138d9cc66be0c918

Merge "Print in 'list devices all' the IDevice class type"

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 6b3b1ff..879d91f 100644
--- a/src/com/android/tradefed/device/DeviceManager.java
+++ b/src/com/android/tradefed/device/DeviceManager.java
@@ -1051,9 +1051,21 @@
 
     @Override
     public void displayDevicesInfo(PrintWriter stream, boolean includeStub) {
-        ArrayList<List<String>> displayRows = new ArrayList<List<String>>();
-        displayRows.add(Arrays.asList("Serial", "State", "Allocation", "Product", "Variant",
-                "Build", "Battery"));
+        List<List<String>> displayRows = new ArrayList<List<String>>();
+        List<String> headers =
+                new ArrayList<>(
+                        Arrays.asList(
+                                "Serial",
+                                "State",
+                                "Allocation",
+                                "Product",
+                                "Variant",
+                                "Build",
+                                "Battery"));
+        if (includeStub) {
+            headers.add("class");
+        }
+        displayRows.add(headers);
         List<DeviceDescriptor> deviceList = listAllDevices();
         sortDeviceList(deviceList);
         addDevicesInfo(displayRows, deviceList, includeStub);
@@ -1111,15 +1123,20 @@
             if (desc.getDisplaySerial() != null) {
                 serial = desc.getDisplaySerial();
             }
-            displayRows.add(
-                    Arrays.asList(
-                            serial,
-                            desc.getDeviceState().toString(),
-                            desc.getState().toString(),
-                            desc.getProduct(),
-                            desc.getProductVariant(),
-                            desc.getBuildId(),
-                            desc.getBatteryLevel()));
+            List<String> infos =
+                    new ArrayList<>(
+                            Arrays.asList(
+                                    serial,
+                                    desc.getDeviceState().toString(),
+                                    desc.getState().toString(),
+                                    desc.getProduct(),
+                                    desc.getProductVariant(),
+                                    desc.getBuildId(),
+                                    desc.getBatteryLevel()));
+            if (includeStub) {
+                infos.add(desc.getDeviceClass());
+            }
+            displayRows.add(infos);
         }
     }