1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 6cb409ef..431a19ee 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -16,13 +16,16 @@
 
 package com.android.providers.downloads;
 
+import org.apache.http.conn.params.ConnRouteParams;
+
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.drm.mobile1.DrmRawContent;
-import android.net.Uri;
 import android.net.http.AndroidHttpClient;
+import android.net.Proxy;
+import android.net.Uri;
 import android.os.FileUtils;
 import android.os.PowerManager;
 import android.os.Process;
@@ -141,6 +144,10 @@ public class DownloadThread extends Thread {
             }
             setupDestinationFile(state, innerState);
             client = AndroidHttpClient.newInstance(userAgent(), mContext);
+            // Set or unset proxy, which may have changed since last GET request.
+            // setDefaultProxy() supports null as proxy parameter.
+            ConnRouteParams.setDefaultProxy(client.getParams(),
+                    Proxy.getPreferredHttpHost(mContext, mInfo.mUri));
             request = new HttpGet(mInfo.mUri);
             addRequestHeaders(innerState, request);