diff --git a/src/com/android/providers/downloads/DownloadNotification.java b/src/com/android/providers/downloads/DownloadNotification.java
index bbd39f6..efdc08b 100644
--- a/src/com/android/providers/downloads/DownloadNotification.java
+++ b/src/com/android/providers/downloads/DownloadNotification.java
@@ -190,8 +190,13 @@
             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 bd91eaa..537a9ea 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -473,7 +473,7 @@
         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,
