AI 146739: am: CL 146689 Broken AVDs are now loaded by default, and we provide a way to fix one (new) type of error (wrong paths to the system image)

  Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 146739

3 files changed, 12 insertions, 10 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java
index 7ee3def..04393c9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java
@@ -387,7 +387,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener
             // not compatible.
             AvdInfo preferredAvd = null;
             if (config.mAvdName != null) {
-                preferredAvd = avdManager.getAvd(config.mAvdName);
+                preferredAvd = avdManager.getAvd(config.mAvdName, true /*validAvdOnly*/);
                 if (projectTarget.isCompatibleBaseFor(preferredAvd.getTarget()) == false) {
                     preferredAvd = null;
 
@@ -434,7 +434,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener
             for (IDevice d : devices) {
                 String deviceAvd = d.getAvdName();
                 if (deviceAvd != null) { // physical devices return null.
-                    AvdInfo info = avdManager.getAvd(deviceAvd);
+                    AvdInfo info = avdManager.getAvd(deviceAvd, true /*validAvdOnly*/);
                     if (info != null && projectTarget.isCompatibleBaseFor(info.getTarget())) {
                         compatibleRunningAvds.put(d, info);
                     }
@@ -465,7 +465,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener
                 
                 // we are going to take the closest AVD. ie a compatible AVD that has the API level
                 // closest to the project target.
-                AvdInfo[] avds = avdManager.getAvds();
+                AvdInfo[] avds = avdManager.getValidAvds();
                 AvdInfo defaultAvd = null;
                 for (AvdInfo avd : avds) {
                     if (projectTarget.isCompatibleBaseFor(avd.getTarget())) {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DeviceChooserDialog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DeviceChooserDialog.java
index 13bb83a..1bc07fe 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DeviceChooserDialog.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/DeviceChooserDialog.java
@@ -157,7 +157,8 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
                             }
                         } else {
                             // get the AvdInfo
-                            AvdInfo info = mSdk.getAvdManager().getAvd(device.getAvdName());
+                            AvdInfo info = mSdk.getAvdManager().getAvd(device.getAvdName(),
+                                    true /*validAvdOnly*/);
                             if (info == null) {
                                 return mWarningImage;
                             }
@@ -184,7 +185,8 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
                         }
                     case 2:
                         if (device.isEmulator()) {
-                            AvdInfo info = mSdk.getAvdManager().getAvd(device.getAvdName());
+                            AvdInfo info = mSdk.getAvdManager().getAvd(device.getAvdName(),
+                                    true /*validAvdOnly*/);
                             if (info == null) {
                                 return "?";
                             }
@@ -263,7 +265,7 @@ public class DeviceChooserDialog extends Dialog implements IDeviceChangeListener
         // get the full list of Android Virtual Devices
         AvdManager avdManager = mSdk.getAvdManager();
         if (avdManager != null) {
-            mFullAvdList = avdManager.getAvds();
+            mFullAvdList = avdManager.getValidAvds();
         } else {
             mFullAvdList = null;
         }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/EmulatorConfigTab.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/EmulatorConfigTab.java
index 24380eb..bba7126 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/EmulatorConfigTab.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/EmulatorConfigTab.java
@@ -149,7 +149,7 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
         
         // radio button for the target mode
         Group targetModeGroup = new Group(topComp, SWT.NONE);
-        targetModeGroup.setText("Device Target Selection Mode");
+        targetModeGroup.setText("Deployment Target Selection Mode");
         gd = new GridData(GridData.FILL_HORIZONTAL);
         targetModeGroup.setLayoutData(gd);
         layout = new GridLayout();
@@ -186,7 +186,7 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
         offsetComp.setLayout(layout);
 
         mPreferredAvdLabel = new Label(offsetComp, SWT.NONE);
-        mPreferredAvdLabel.setText("Select a preferred Android Virtual Device:");
+        mPreferredAvdLabel.setText("Select a preferred Android Virtual Device for deployment:");
         AvdInfo[] avds = new AvdInfo[0];
         mPreferredAvdSelector = new AvdSelector(offsetComp, avds);
         mPreferredAvdSelector.setTableHeightHint(100);
@@ -338,7 +338,7 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
         // update the AVD list
         AvdInfo[] avds = null;
         if (avdManager != null) {
-            avds = avdManager.getAvds();
+            avds = avdManager.getValidAvds();
         }
 
         IAndroidTarget projectTarget = null;
@@ -359,7 +359,7 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
         }
 
         if (stringValue != null && stringValue.length() > 0 && avdManager != null) {
-            AvdInfo targetAvd = avdManager.getAvd(stringValue);
+            AvdInfo targetAvd = avdManager.getAvd(stringValue, true /*validAvdOnly*/);
             mPreferredAvdSelector.setSelection(targetAvd);
         } else {
             mPreferredAvdSelector.setSelection(null);