Provide readable device name rather than just serial number

There are a number of places where we need to display a device
name. Currently, DDMS shows the serial number + manufacturer/model
if available, but in other instances, we just show the serial
number.

This CL provides a getName() method in the IDevice interface so
that all the locations which require a human readable name can
use this.

The name is typically of the form manufacturer-model-serial.
If the manufacturer/model strings are not available, then those
fields are omitted, so it will show just the serial number.

Change-Id: I80ef7b48a4c7c8587042c1227c932251e18dba2e

3 files changed, 5 insertions, 13 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java
index 22c9470..781deaf 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/DeviceChooserDialog.java
@@ -167,7 +167,7 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
                 IDevice device = (IDevice)element;
                 switch (columnIndex) {
                     case 0:
-                        return device.getSerialNumber();
+                        return device.getName();
                     case 1:
                         if (device.isEmulator()) {
                             return device.getAvdName();
@@ -261,6 +261,7 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
     public DeviceChooserDialog(Shell parent, DeviceChooserResponse response, String packageName,
             IAndroidTarget projectTarget) {
         super(parent);
+
         mResponse = response;
         mPackageName = packageName;
         mProjectTarget = projectTarget;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
index 8e5e333..1085f3f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
@@ -219,12 +219,7 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate {
         IDevice[] devices = AndroidDebugBridge.getBridge().getDevices();
 
         for (IDevice device : devices) {
-            String name = device.getAvdName();
-            if (name == null) {
-                name = device.getSerialNumber();
-            }
-
-            if (name.equals(deviceName)) {
+            if (device.getName().equals(deviceName)) {
                 return device;
             }
         }
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLTraceOptionsDialog.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLTraceOptionsDialog.java
index 4023061..ef94452 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLTraceOptionsDialog.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/GLTraceOptionsDialog.java
@@ -234,16 +234,12 @@ public class GLTraceOptionsDialog extends TitleAreaDialog {
 
         List<String> items = new ArrayList<String>(devices.length);
         for (IDevice d : devices) {
-            String name = d.getAvdName();
-            if (name == null) {
-                name = d.getSerialNumber();
-            }
-            items.add(name);
+            items.add(d.getName());
         }
         mDeviceCombo.setItems(items.toArray(new String[items.size()]));
 
         int index = 0;
-        if (mLastUsedDevice != null) {
+        if (items.contains(mLastUsedDevice)) {
             index = items.indexOf(mLastUsedDevice);
         }
         if (index >= 0 && index < items.size()) {