summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatherine Liu <wlcl05@motorola.com>2013-03-08 10:19:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-08 10:19:49 -0800
commit4602bf9d3238fc17bb3fb0fd751aa21b32ca4bf9 (patch)
treea8a9a9f13b2222fc501bbdef811eccbe74170ba0
parent2fa007ef678b2283d47d007aa3dc91af683cc52c (diff)
parent1c074231df1ddad86cf7db1bed71a249c951ecec (diff)
downloadandroid_packages_providers_DownloadProvider-4602bf9d3238fc17bb3fb0fd751aa21b32ca4bf9.tar.gz
android_packages_providers_DownloadProvider-4602bf9d3238fc17bb3fb0fd751aa21b32ca4bf9.tar.bz2
android_packages_providers_DownloadProvider-4602bf9d3238fc17bb3fb0fd751aa21b32ca4bf9.zip
am 1c074231: am af909b55: Fix large file download failure issue
* commit '1c074231df1ddad86cf7db1bed71a249c951ecec': Fix large file download failure issue
-rw-r--r--src/com/android/providers/downloads/DownloadNotification.java9
-rw-r--r--src/com/android/providers/downloads/DownloadThread.java2
2 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/providers/downloads/DownloadNotification.java b/src/com/android/providers/downloads/DownloadNotification.java
index f5778e79..da2ce2a8 100644
--- a/src/com/android/providers/downloads/DownloadNotification.java
+++ b/src/com/android/providers/downloads/DownloadNotification.java
@@ -192,8 +192,13 @@ class DownloadNotification {
if (hasPausedText) {
builder.setContentText(item.mPausedText);
} else {
- builder.setProgress(
- (int) item.mTotalTotal, (int) item.mTotalCurrent, item.mTotalTotal == -1);
+ long max = item.mTotalTotal;
+ long progress = item.mTotalCurrent;
+ while(max > Integer.MAX_VALUE) {
+ max = max / 1024;
+ progress = progress / 1024;
+ }
+ builder.setProgress((int) max, (int) progress, item.mTotalTotal == -1);
if (hasContentText) {
builder.setContentInfo(
buildPercentageLabel(mContext, item.mTotalTotal, item.mTotalCurrent));
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index e74d5c72..3a613572 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -488,7 +488,7 @@ public class DownloadThread extends Thread {
mContext.getContentResolver().update(mInfo.getAllDownloadsUri(), values, null, null);
boolean lengthMismatched = (innerState.mHeaderContentLength != null)
- && (state.mCurrentBytes != Integer.parseInt(innerState.mHeaderContentLength));
+ && (state.mCurrentBytes != Long.parseLong(innerState.mHeaderContentLength));
if (lengthMismatched) {
if (cannotResume(state)) {
throw new StopRequestException(Downloads.Impl.STATUS_CANNOT_RESUME,