diff options
Diffstat (limited to 'ddms')
| -rw-r--r-- | ddms/libs/ddmlib/src/com/android/ddmlib/EmulatorConsole.java | 2 | ||||
| -rw-r--r-- | ddms/libs/ddmuilib/src/com/android/ddmuilib/DevicePanel.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/EmulatorConsole.java b/ddms/libs/ddmlib/src/com/android/ddmlib/EmulatorConsole.java index 74c432d..f3986ed 100644 --- a/ddms/libs/ddmlib/src/com/android/ddmlib/EmulatorConsole.java +++ b/ddms/libs/ddmlib/src/com/android/ddmlib/EmulatorConsole.java @@ -54,7 +54,7 @@ public final class EmulatorConsole { private final static String HOST = "127.0.0.1"; //$NON-NLS-1$ private final static String COMMAND_PING = "help\r\n"; //$NON-NLS-1$ - private final static String COMMAND_AVD_NAME = "vm name\r\n"; //$NON-NLS-1$ // TODO change with emulator + private final static String COMMAND_AVD_NAME = "avd name\r\n"; //$NON-NLS-1$ private final static String COMMAND_KILL = "kill\r\n"; //$NON-NLS-1$ private final static String COMMAND_GSM_STATUS = "gsm status\r\n"; //$NON-NLS-1$ private final static String COMMAND_GSM_CALL = "gsm call %1$s\r\n"; //$NON-NLS-1$ 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); |