Merge: Set 'https' proxy system properties using the 'http' settings, allowing downlo...

Change-Id: Ic2ad4c0b4565c1a7148a7635c3f745b52448b986

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
index 4d10b54..34b2472 100755 (executable)
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/SettingsController.java
@@ -269,10 +269,18 @@ public class SettingsController {
      */\r
     public void applySettings() {\r
         Properties props = System.getProperties();\r
-        props.setProperty(ISettingsPage.KEY_HTTP_PROXY_HOST,\r
-                mProperties.getProperty(ISettingsPage.KEY_HTTP_PROXY_HOST, "")); //$NON-NLS-1$\r
-        props.setProperty(ISettingsPage.KEY_HTTP_PROXY_PORT,\r
-                mProperties.getProperty(ISettingsPage.KEY_HTTP_PROXY_PORT, ""));   //$NON-NLS-1$\r
-    }\r
+\r
+        // Get the configured HTTP proxy settings\r
+        String proxyHost = mProperties.getProperty(ISettingsPage.KEY_HTTP_PROXY_HOST,\r
+                ""); //$NON-NLS-1$\r
+        String proxyPort = mProperties.getProperty(ISettingsPage.KEY_HTTP_PROXY_PORT,\r
+                ""); //$NON-NLS-1$\r
+\r
+        // Set both the HTTP and HTTPS proxy system properties\r
+        props.setProperty(ISettingsPage.KEY_HTTP_PROXY_HOST, proxyHost);\r
+        props.setProperty(ISettingsPage.KEY_HTTP_PROXY_PORT, proxyPort);\r
+        props.setProperty("https.proxyHost", proxyHost); //$NON-NLS-1$\r
+        props.setProperty("https.proxyPort", proxyPort); //$NON-NLS-1$\r
+     }\r
 \r
 }\r