diff options
| author | Siva Velusamy <vsiva@google.com> | 2012-06-13 13:04:53 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-13 13:04:53 -0700 |
| commit | dc96f467dc762046bf2adbb4be90e5be7d498a65 (patch) | |
| tree | 05bdb704eda4cd83af2b1e41b163b5d4734545e4 /eclipse | |
| parent | 79be759f77ee9d834e635fe3163368f3c492c9fb (diff) | |
| parent | b7f70835c533f0f07a1f52f75a1bbe783c32e010 (diff) | |
| download | sdk-dc96f467dc762046bf2adbb4be90e5be7d498a65.zip sdk-dc96f467dc762046bf2adbb4be90e5be7d498a65.tar.gz sdk-dc96f467dc762046bf2adbb4be90e5be7d498a65.tar.bz2 | |
Merge "Provide readable device name rather than just serial number"
Diffstat (limited to 'eclipse')
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()) { |