diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-16 12:08:48 -0800 |
|---|---|---|
| committer | Vasu Nori <vnori@google.com> | 2011-01-16 12:11:23 -0800 |
| commit | 3022abb31ad80a5e4b263ac078709e91b97bf226 (patch) | |
| tree | 0cdb117e2cb1cc363264c866a458b48bdd9f1a2b /src | |
| parent | 47cb8be0fea98c2f9d96b269278f2e011e810413 (diff) | |
| download | android_packages_providers_DownloadProvider-3022abb31ad80a5e4b263ac078709e91b97bf226.tar.gz android_packages_providers_DownloadProvider-3022abb31ad80a5e4b263ac078709e91b97bf226.tar.bz2 android_packages_providers_DownloadProvider-3022abb31ad80a5e4b263ac078709e91b97bf226.zip | |
manual merge of GB change Change-Id: I1acf2fb9491d24f5e109206a91dda3eea429e447
Change-Id: Ibaf889d78fc99a32038a77671036fc6a5068580f
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadInfo.java | 3 | ||||
| -rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java index ca43ea99..28a38b3b 100644 --- a/src/com/android/providers/downloads/DownloadInfo.java +++ b/src/com/android/providers/downloads/DownloadInfo.java @@ -70,7 +70,6 @@ public class DownloadInfo { info.mNumFailed = getInt(Constants.FAILED_CONNECTIONS); int retryRedirect = getInt(Constants.RETRY_AFTER_X_REDIRECT_COUNT); info.mRetryAfter = retryRedirect & 0xfffffff; - info.mRedirectCount = retryRedirect >> 28; info.mLastMod = getLong(Downloads.Impl.COLUMN_LAST_MODIFICATION); info.mPackage = getString(Downloads.Impl.COLUMN_NOTIFICATION_PACKAGE); info.mClass = getString(Downloads.Impl.COLUMN_NOTIFICATION_CLASS); @@ -194,7 +193,6 @@ public class DownloadInfo { public int mStatus; public int mNumFailed; public int mRetryAfter; - public int mRedirectCount; public long mLastMod; public String mPackage; public String mClass; @@ -479,7 +477,6 @@ public class DownloadInfo { Log.v(Constants.TAG, "STATUS : " + mStatus); Log.v(Constants.TAG, "FAILED_C: " + mNumFailed); Log.v(Constants.TAG, "RETRY_AF: " + mRetryAfter); - Log.v(Constants.TAG, "REDIRECT: " + mRedirectCount); Log.v(Constants.TAG, "LAST_MOD: " + mLastMod); Log.v(Constants.TAG, "PACKAGE : " + mPackage); Log.v(Constants.TAG, "CLASS : " + mClass); diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index 61fb209f..81e67a1a 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -94,7 +94,6 @@ public class DownloadThread extends Thread { public State(DownloadInfo info) { mMimeType = sanitizeMimeType(info.mMimeType); - mRedirectCount = info.mRedirectCount; mRequestUri = info.mUri; mFilename = info.mFileName; } @@ -194,7 +193,7 @@ public class DownloadThread extends Thread { } cleanupDestination(state, finalStatus); notifyDownloadCompleted(finalStatus, state.mCountRetry, state.mRetryAfter, - state.mRedirectCount, state.mGotData, state.mFilename, + state.mGotData, state.mFilename, state.mNewUri, state.mMimeType, errorMsg); mInfo.mHasActiveThread = false; } @@ -865,10 +864,10 @@ public class DownloadThread extends Thread { * Stores information about the completed download, and notifies the initiating application. */ private void notifyDownloadCompleted( - int status, boolean countRetry, int retryAfter, int redirectCount, boolean gotData, + int status, boolean countRetry, int retryAfter, boolean gotData, String filename, String uri, String mimeType, String errorMsg) { notifyThroughDatabase( - status, countRetry, retryAfter, redirectCount, gotData, filename, uri, mimeType, + status, countRetry, retryAfter, gotData, filename, uri, mimeType, errorMsg); if (Downloads.Impl.isStatusCompleted(status)) { mInfo.sendIntentIfRequested(); @@ -876,7 +875,7 @@ public class DownloadThread extends Thread { } private void notifyThroughDatabase( - int status, boolean countRetry, int retryAfter, int redirectCount, boolean gotData, + int status, boolean countRetry, int retryAfter, boolean gotData, String filename, String uri, String mimeType, String errorMsg) { ContentValues values = new ContentValues(); values.put(Downloads.Impl.COLUMN_STATUS, status); @@ -886,7 +885,7 @@ public class DownloadThread extends Thread { } values.put(Downloads.Impl.COLUMN_MIME_TYPE, mimeType); values.put(Downloads.Impl.COLUMN_LAST_MODIFICATION, mSystemFacade.currentTimeMillis()); - values.put(Constants.RETRY_AFTER_X_REDIRECT_COUNT, retryAfter + (redirectCount << 28)); + values.put(Constants.RETRY_AFTER_X_REDIRECT_COUNT, retryAfter); if (!countRetry) { values.put(Constants.FAILED_CONNECTIONS, 0); } else if (gotData) { |