resolved conflicts for merge of b108a273 to gingerbread-plus-aosp
Steve Howard [Thu, 30 Sep 2010 18:21:33 +0000 (11:21 -0700)]
Change-Id: Iced3a5360702fdeb299f8b987a353d3aeca7629b

1  2 
src/com/android/providers/downloads/DownloadThread.java

@@@ -161,10 -156,7 +160,11 @@@ public class DownloadThread extends Thr
  
              boolean finished = false;
              while(!finished) {
+                 Log.i(Constants.TAG, "Initiating request for download " + mInfo.mId);
 +                // 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, state.mRequestUri));
                  HttpGet request = new HttpGet(state.mRequestUri);
                  try {
                      executeDownload(state, client, request);