Merge "Fixing NPE when creating new device in old AVD manager" into studio-1.0-devgradle_0.14.4gradle_0.14.3gradle_0.14.2gradle_0.14.1gradle_0.14.0

1 files changed, 5 insertions, 3 deletions

diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/DeviceCreationDialog.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/DeviceCreationDialog.java
index fecae16..a2b91f1 100644
--- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/DeviceCreationDialog.java
+++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/DeviceCreationDialog.java
@@ -914,9 +914,11 @@ public class DeviceCreationDialog extends GridDialog {
             builder.setManufacturer("User");
             builder.setName(mDeviceName.getText());
 
-            builder.setTagId(mDevice.getTagId());
-            for (Map.Entry<String, String> entry : mDevice.getBootProps().entrySet()) {
-                builder.addBootProp(entry.getKey(), entry.getValue());
+            if (mDevice != null) {
+                builder.setTagId(mDevice.getTagId());
+                for (Map.Entry<String, String> entry : mDevice.getBootProps().entrySet()) {
+                    builder.addBootProp(entry.getKey(), entry.getValue());
+                }
             }
 
             builder.addSoftware(mSoftware);