AI 144394: am: CL 144254 am: CL 144252 Reload AVDs when displaying the run/debug...

  Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144394

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 3789153..24380eb 100644 (file)
--- 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
@@ -21,6 +21,7 @@ import com.android.ide.eclipse.adt.launch.AndroidLaunchConfiguration.TargetMode;
 import com.android.ide.eclipse.adt.sdk.Sdk;
 import com.android.ide.eclipse.common.project.BaseProjectHelper;
 import com.android.ide.eclipse.ddms.DdmsPlugin;
+import com.android.prefs.AndroidLocation.AndroidLocationException;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.avd.AvdManager;
 import com.android.sdklib.avd.AvdManager.AvdInfo;
@@ -126,6 +127,14 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab {
      */
     public void createControl(Composite parent) {
         Font font = parent.getFont();
+        
+        // reload the AVDs to make sure we are up to date
+        try {
+            Sdk.getCurrent().getAvdManager().reloadAvds();
+        } catch (AndroidLocationException e1) {
+            // this happens if the AVD Manager failed to find the folder in which the AVDs are
+            // stored. There isn't much we can do at this point.
+        }
 
         Composite topComp = new Composite(parent, SWT.NONE);
         setControl(topComp);