diff options
author | Steve Howard <showard@google.com> | 2010-09-23 12:50:21 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 12:50:21 -0700 |
commit | 5dbaa73a7f356f67810becbf3ad258a7dd765e59 (patch) | |
tree | 99fa0dfe7b1ce6699cff3e188f878252eda93ffe /src/com/android/providers/downloads/DownloadThread.java | |
parent | ca3d52cc2aa06ab889f2680f1cc28f540efc1cf1 (diff) | |
parent | ebb555c0687061993dd6a22d15f6aab2437ee8c5 (diff) | |
download | android_packages_providers_DownloadProvider-5dbaa73a7f356f67810becbf3ad258a7dd765e59.tar.gz android_packages_providers_DownloadProvider-5dbaa73a7f356f67810becbf3ad258a7dd765e59.tar.bz2 android_packages_providers_DownloadProvider-5dbaa73a7f356f67810becbf3ad258a7dd765e59.zip |
am ebb555c0: Support multi-valued HTTP headers, handle new API changes
Merge commit 'ebb555c0687061993dd6a22d15f6aab2437ee8c5' into gingerbread-plus-aosp
* commit 'ebb555c0687061993dd6a22d15f6aab2437ee8c5':
Support multi-valued HTTP headers, handle new API changes
Diffstat (limited to 'src/com/android/providers/downloads/DownloadThread.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index e8252eef..c7a8b682 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -32,6 +32,7 @@ import android.provider.Downloads; import android.provider.DrmStore; import android.util.Config; import android.util.Log; +import android.util.Pair; import org.apache.http.Header; import org.apache.http.HttpResponse; @@ -46,7 +47,6 @@ import java.io.SyncFailedException; import java.net.URI; import java.net.URISyntaxException; import java.util.Locale; -import java.util.Map; /** * Runs an actual download @@ -865,8 +865,8 @@ public class DownloadThread extends Thread { * Add custom headers for this download to the HTTP request. */ private void addRequestHeaders(InnerState innerState, HttpGet request) { - for (Map.Entry<String, String> header : mInfo.getHeaders().entrySet()) { - request.addHeader(header.getKey(), header.getValue()); + for (Pair<String, String> header : mInfo.getHeaders()) { + request.addHeader(header.first, header.second); } if (innerState.mContinuingDownload) { |