am 3de25903: am 8e3442f1: Merge change Ic291d534 into eclair-sdk

Merge commit '3de259034c5d028e98d9456775e75d9d12a060c6' into eclair-mr2

* commit '3de259034c5d028e98d9456775e75d9d12a060c6':
  SDK Manager: refresh sources when HTTP/S pref is changed.
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
index fe94d86..7c793e4 100755
--- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
+++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
@@ -21,8 +21,6 @@
 import com.android.sdklib.ISdkLog;

 

 import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

 

 import java.io.File;

 import java.io.FileInputStream;

@@ -248,6 +246,10 @@
         mSettingsPage.retrieveSettings(mProperties);

         applySettings();

         saveSettings();

+

+        // In case the HTTP/HTTPS setting change, force sources to be reloaded

+        // (this only refreshes sources that the user has already tried to open.)

+        mUpdaterData.refreshSources(false /*forceFetching*/);

     }

 

     /**