diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:29 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:29 -0800 |
| commit | 4fd2474506c1ea3cb96e128d72db2a18ec1e258d (patch) | |
| tree | 5457d1e4f807ae30e59b72f74d876284b20eba9d /ddms/libs/ddmuilib/src | |
| parent | b58a893bf9ba96db9a544cd33af4828826b73061 (diff) | |
| download | sdk-4fd2474506c1ea3cb96e128d72db2a18ec1e258d.zip sdk-4fd2474506c1ea3cb96e128d72db2a18ec1e258d.tar.gz sdk-4fd2474506c1ea3cb96e128d72db2a18ec1e258d.tar.bz2 | |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'ddms/libs/ddmuilib/src')
| -rw-r--r-- | ddms/libs/ddmuilib/src/com/android/ddmuilib/DevicePanel.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/DevicePanel.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/DevicePanel.java index d168476..81b757e 100644 --- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/DevicePanel.java +++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/DevicePanel.java @@ -205,6 +205,10 @@ public final class DevicePanel extends Panel implements IDebugBridgeChangeListen String debuggable = device.getProperty(Device.PROP_DEBUGGABLE); if (device.isEmulator()) { String avdName = device.getAvdName(); + if (avdName == null) { + avdName = "?"; // the device is probably not online yet, so + // we don't know its AVD name just yet. + } if (debuggable != null && debuggable.equals("1")) { //$NON-NLS-1$ return String.format("%1$s [%2$s, debug]", avdName, version); |