am ca4603db: SDK: fix NPE in AVD Manager > Start when skin.path is missing.

Merge commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad' into eclair

* commit 'ca4603db2fa5cd0231d75ebcef239cd69e1772ad':
  SDK: fix NPE in AVD Manager > Start when skin.path is missing.

diff --combined tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java
index 3d669f6,720ee12..a2a9218
--- 1/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java
--- 2/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java
+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdStartDialog.java
@@@ -374,7 -374,7 +374,7 @@@ final class AvdStartDialog extends Grid
          }
  
          if (sMonitorDpi == -1) { // first time? try to get a value
 -             sMonitorDpi = Toolkit.getDefaultToolkit().getScreenResolution();
 +            sMonitorDpi = Toolkit.getDefaultToolkit().getScreenResolution();
          }
  
          return sMonitorDpi;
@@@ -424,6 -424,7 +424,7 @@@
                  mSize2 = Integer.parseInt(m.group(2));
                  mSkinDisplay = skinName;
                  mEnableScaling = true;
+                 return;
              }
          }
  
@@@ -431,15 -432,18 +432,18 @@@
          mEnableScaling = false; // default to false for now.
  
          // path to the skin layout file.
-         File skinFolder = new File(mSdkLocation, prop.get(AvdManager.AVD_INI_SKIN_PATH));
-         if (skinFolder.isDirectory()) {
-             File layoutFile = new File(skinFolder, "layout");
-             if (layoutFile.isFile()) {
-                 if (parseLayoutFile(layoutFile)) {
-                     mSkinDisplay = String.format("%1$s (%2$dx%3$d)", skinName, mSize1, mSize2);
-                     mEnableScaling = true;
-                 } else {
-                     mSkinDisplay = skinName;
+         String skinPath = prop.get(AvdManager.AVD_INI_SKIN_PATH);
+         if (skinPath != null) {
+             File skinFolder = new File(mSdkLocation, skinPath);
+             if (skinFolder.isDirectory()) {
+                 File layoutFile = new File(skinFolder, "layout");
+                 if (layoutFile.isFile()) {
+                     if (parseLayoutFile(layoutFile)) {
+                         mSkinDisplay = String.format("%1$s (%2$dx%3$d)", skinName, mSize1, mSize2);
+                         mEnableScaling = true;
+                     } else {
+                         mSkinDisplay = skinName;
+                     }
                  }
              }
          }