summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatherine Liu <wlcl05@motorola.com>2013-03-08 10:18:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-08 10:18:26 -0800
commit1c074231df1ddad86cf7db1bed71a249c951ecec (patch)
treeb1d9737888992db1dcb8622d5e92aa2deba5f9da
parentd7dd6019baf12961dce722d33003e238cdd72f6a (diff)
parentaf909b55fe1ffa78e69cfda862fd5ebce712ac7a (diff)
downloadandroid_packages_providers_DownloadProvider-1c074231df1ddad86cf7db1bed71a249c951ecec.tar.gz
android_packages_providers_DownloadProvider-1c074231df1ddad86cf7db1bed71a249c951ecec.tar.bz2
android_packages_providers_DownloadProvider-1c074231df1ddad86cf7db1bed71a249c951ecec.zip
am af909b55: Fix large file download failure issue
* commit 'af909b55fe1ffa78e69cfda862fd5ebce712ac7a': 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 bbd39f60..efdc08b0 100644
--- a/src/com/android/providers/downloads/DownloadNotification.java
+++ b/src/com/android/providers/downloads/DownloadNotification.java
@@ -190,8 +190,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 bd91eaa1..537a9ea7 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -473,7 +473,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,