Improve download remaining time calculation.

Calculate remaining time in DownloadNotifier so we always use the
most recent progress data, which avoids showing stale times.

Weight speed calculation to prefer historical data so remaining time
is smoother on bumpy network connections.

Bug: 7631948
Change-Id: I497be0899e65086356745340b19d3987c6185bdd

1 files changed, 2 insertions, 11 deletions

diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 2bd3d362..34bc8e34 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -107,8 +107,6 @@ public class DownloadThread extends Thread {
         public long mSpeedSampleStart;
         /** Bytes transferred since current sample started. */
         public long mSpeedSampleBytes;
-        /** Estimated time until finished. */
-        public long mRemainingMillis;
 
         public State(DownloadInfo info) {
             mMimeType = Intent.normalizeMimeType(info.mMimeType);
@@ -443,20 +441,13 @@ public class DownloadThread extends Thread {
             if (state.mSpeed == 0) {
                 state.mSpeed = sampleSpeed;
             } else {
-                state.mSpeed = (state.mSpeed + sampleSpeed) / 2;
+                state.mSpeed = ((state.mSpeed * 3) + sampleSpeed) / 4;
             }
 
             state.mSpeedSampleStart = now;
             state.mSpeedSampleBytes = state.mCurrentBytes;
 
-            if (state.mSpeed != 0) {
-                state.mRemainingMillis = ((state.mTotalBytes - state.mCurrentBytes) * 1000)
-                        / state.mSpeed;
-            } else {
-                state.mRemainingMillis = -1;
-            }
-
-            DownloadHandler.getInstance().setRemainingMillis(mInfo.mId, state.mRemainingMillis);
+            DownloadHandler.getInstance().setCurrentSpeed(mInfo.mId, state.mSpeed);
         }
 
         if (state.mCurrentBytes - state.mBytesNotified > Constants.MIN_PROGRESS_STEP &&