Bugfix:5033349

- Checking download data dir instread of /cache.
- Trying to remove stale files regardless of the low space thereshold.
(Note: This bug happens when download dir size is 100mb and there is a
file > 100mb in /cache.)

Change-Id: Iacded74eaadb2aa7f0af8d1b7e0f922e81c7e07c

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/providers/downloads/StorageManager.java b/src/com/android/providers/downloads/StorageManager.java
index 228f6681..27668601 100644
--- a/src/com/android/providers/downloads/StorageManager.java
+++ b/src/com/android/providers/downloads/StorageManager.java
@@ -222,16 +222,17 @@ class StorageManager {
         }
         if (root.equals(mDownloadDataDir)) {
             // this download is going into downloads data dir. check space in that specific dir.
-            bytesAvailable = getAvailableBytesInDownloadsDataDir(mSystemCacheDir);
+            bytesAvailable = getAvailableBytesInDownloadsDataDir(mDownloadDataDir);
             if (bytesAvailable < sDownloadDataDirLowSpaceThreshold) {
                 // print a warning
                 Log.w(Constants.TAG, "Downloads data dir: " + root +
-                        " is running low on space. space available (in b): " + bytesAvailable);
-            } else if (bytesAvailable < targetBytes) {
+                        " is running low on space. space available (in bytes): " + bytesAvailable);
+            }
+            if (bytesAvailable < targetBytes) {
                 // Insufficient space; make space.
                 discardPurgeableFiles(destination, sDownloadDataDirLowSpaceThreshold);
                 removeSpuriousFiles();
-                bytesAvailable = getAvailableBytesInDownloadsDataDir(mSystemCacheDir);
+                bytesAvailable = getAvailableBytesInDownloadsDataDir(mDownloadDataDir);
             }
         }
         if (bytesAvailable < targetBytes) {