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, 6 insertions, 5 deletions

diff --git a/src/com/android/providers/downloads/DownloadNotifier.java b/src/com/android/providers/downloads/DownloadNotifier.java
index f6e7a2ee..f89d2d02 100644
--- a/src/com/android/providers/downloads/DownloadNotifier.java
+++ b/src/com/android/providers/downloads/DownloadNotifier.java
@@ -163,23 +163,24 @@ public class DownloadNotifier {
 
                 long current = 0;
                 long total = 0;
-                long remainingMillis = -1;
+                long speed = 0;
                 for (DownloadInfo info : cluster) {
                     if (info.mTotalBytes != -1) {
                         current += info.mCurrentBytes;
                         total += info.mTotalBytes;
-                        remainingMillis = Math.max(
-                                handler.getRemainingMillis(info.mId), remainingMillis);
+                        speed += handler.getCurrentSpeed(info.mId);
                     }
                 }
 
                 if (total > 0) {
                     final int percent = (int) ((current * 100) / total);
-                    if (remainingMillis != -1) {
+                    percentText = res.getString(R.string.download_percent, percent);
+
+                    if (speed > 0) {
+                        final long remainingMillis = ((total - current) * 1000) / speed;
                         remainingText = res.getString(R.string.download_remaining,
                                 DateUtils.formatDuration(remainingMillis));
                     }
-                    percentText = res.getString(R.string.download_percent, percent);
 
                     builder.setProgress(100, percent, false);
                 } else {