Support for custom HTTP headers on download requests

Provider changes:
* new many-to-one DB table holding headers for each download.  since
  there was no real migration logic in DownloadProvider, I implemented
  some.
* DownloadProvider.insert() reads request headers out of the
  ContentValues and puts them into the new table
* DownloadProvider.query() supports a new URI form,
  download/#/headers, to fetch the headers associated with a download
* DownloadProvider.delete() removes request headers from this table

Service changes:
* made DownloadInfo store request headers upon initialization.  While
  I was at it, I refactored the initialization logic into DownloadInfo
  to get rid of the massive 24-parameter constructor.  The right next
  step would be to move the update logic into DownloadInfo and merge
  it with the initialization logic; however, I realized that headers
  don't need to be updatable, and in the future, we won't need the
  update logic at all, so i didn't bother touching the update code.
* made DownloadThread read headers from the DownloadInfo and include
  them in the request; merged the custom Cookie and Referer logic into
  this logic

Also added a couple new test cases for this stuff.

Change-Id: I421ce1f0a694e815f2e099795182393650fcb3ff

1 files changed, 1 insertions, 35 deletions

diff --git a/src/com/android/providers/downloads/DownloadService.java b/src/com/android/providers/downloads/DownloadService.java
index f3bc9586..2e713fbf 100644
--- a/src/com/android/providers/downloads/DownloadService.java
+++ b/src/com/android/providers/downloads/DownloadService.java
@@ -555,41 +555,7 @@ public class DownloadService extends Service {
     private void insertDownload(
             Cursor cursor, int arrayPos,
             boolean networkAvailable, boolean networkRoaming, long now) {
-        int statusColumn = cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_STATUS);
-        int failedColumn = cursor.getColumnIndexOrThrow(Constants.FAILED_CONNECTIONS);
-        int retryRedirect =
-                cursor.getInt(cursor.getColumnIndexOrThrow(Constants.RETRY_AFTER_X_REDIRECT_COUNT));
-        DownloadInfo info = new DownloadInfo(
-                cursor.getInt(cursor.getColumnIndexOrThrow(Downloads.Impl._ID)),
-                cursor.getString(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_URI)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(
-                        Downloads.Impl.COLUMN_NO_INTEGRITY)) == 1,
-                cursor.getString(cursor.getColumnIndexOrThrow(
-                        Downloads.Impl.COLUMN_FILE_NAME_HINT)),
-                cursor.getString(cursor.getColumnIndexOrThrow(Downloads.Impl._DATA)),
-                cursor.getString(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_MIME_TYPE)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_DESTINATION)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_VISIBILITY)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_CONTROL)),
-                cursor.getInt(statusColumn),
-                cursor.getInt(failedColumn),
-                retryRedirect & 0xfffffff,
-                retryRedirect >> 28,
-                cursor.getLong(cursor.getColumnIndexOrThrow(
-                        Downloads.Impl.COLUMN_LAST_MODIFICATION)),
-                cursor.getString(cursor.getColumnIndexOrThrow(
-                        Downloads.Impl.COLUMN_NOTIFICATION_PACKAGE)),
-                cursor.getString(cursor.getColumnIndexOrThrow(
-                        Downloads.Impl.COLUMN_NOTIFICATION_CLASS)),
-                cursor.getString(cursor.getColumnIndexOrThrow(
-                        Downloads.Impl.COLUMN_NOTIFICATION_EXTRAS)),
-                cursor.getString(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_COOKIE_DATA)),
-                cursor.getString(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_USER_AGENT)),
-                cursor.getString(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_REFERER)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_TOTAL_BYTES)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(Downloads.Impl.COLUMN_CURRENT_BYTES)),
-                cursor.getString(cursor.getColumnIndexOrThrow(Constants.ETAG)),
-                cursor.getInt(cursor.getColumnIndexOrThrow(Constants.MEDIA_SCANNED)) == 1);
+        DownloadInfo info = new DownloadInfo(getContentResolver(), cursor);
 
         if (Constants.LOGVV) {
             Log.v(Constants.TAG, "Service adding new entry");