Merge "Merge: Load and apply proxy settings from config file in UpdateNoWindow, allowing headless updates to work behind a proxy." into tools_r9

1 files changed, 6 insertions, 1 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateNoWindow.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateNoWindow.java
index 53ddd1e..fb2c9a4 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateNoWindow.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateNoWindow.java
@@ -63,8 +63,13 @@ public class UpdateNoWindow {
         mForce = force;
         mUpdaterData = new UpdaterData(osSdkRoot, sdkLog);
 
+        // Read and apply settings from settings file, so that http/https proxy is set
+        SettingsController settingsController = mUpdaterData.getSettingsController();
+        settingsController.loadSettings();
+        settingsController.applySettings();
+
         // Change the in-memory settings to force the http/https mode
-        mUpdaterData.getSettingsController().setSetting(ISettingsPage.KEY_FORCE_HTTP, useHttp);
+        settingsController.setSetting(ISettingsPage.KEY_FORCE_HTTP, useHttp);
 
         // Use a factory that only outputs to the given ISdkLog.
         mUpdaterData.setTaskFactory(new ConsoleTaskFactory());