diff options
author | Vasu Nori <vnori@google.com> | 2011-01-07 15:01:50 -0800 |
---|---|---|
committer | Vasu Nori <vnori@google.com> | 2011-01-07 15:01:50 -0800 |
commit | c0f732bad06924bc4ef1652ace35d9b0ffc93e2e (patch) | |
tree | f98b71d247989e2dfac23c444f87157dbb89682b /src/com/android/providers | |
parent | 7d96bafa59111d9ca735e5ef86dc0598f946b2be (diff) | |
download | android_packages_providers_DownloadProvider-c0f732bad06924bc4ef1652ace35d9b0ffc93e2e.tar.gz android_packages_providers_DownloadProvider-c0f732bad06924bc4ef1652ace35d9b0ffc93e2e.tar.bz2 android_packages_providers_DownloadProvider-c0f732bad06924bc4ef1652ace35d9b0ffc93e2e.zip |
Revert "Merge "downloadmanager should use "files" dir - not "cache" dir to store its files" into honeycomb"
This reverts commit 7d96bafa59111d9ca735e5ef86dc0598f946b2be, reversing
changes made to 2ce876d2d7000b0c3a1430c5f4932568090f5170.
Diffstat (limited to 'src/com/android/providers')
-rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 4 | ||||
-rw-r--r-- | src/com/android/providers/downloads/StorageManager.java | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index 9aa0a309..fefbe1d8 100644 --- a/src/com/android/providers/downloads/DownloadThread.java +++ b/src/com/android/providers/downloads/DownloadThread.java @@ -270,8 +270,8 @@ public class DownloadThread extends Thread { reportProgress(state, innerState); if (Constants.LOGVV) { - Log.v(Constants.TAG, "downloaded " + innerState.mBytesSoFar + - ", file: " + mInfo.mFileName + ", uri: " + mInfo.mUri); + Log.v(Constants.TAG, "downloaded " + innerState.mBytesSoFar + " for " + + mInfo.mUri); } checkPausedOrCanceled(state); diff --git a/src/com/android/providers/downloads/StorageManager.java b/src/com/android/providers/downloads/StorageManager.java index e17a3a39..d7d0a7ad 100644 --- a/src/com/android/providers/downloads/StorageManager.java +++ b/src/com/android/providers/downloads/StorageManager.java @@ -89,7 +89,7 @@ class StorageManager { private StorageManager(Context context) { // constructor is private mContext = context; - mDownloadDataDir = context.getFilesDir(); + mDownloadDataDir = context.getCacheDir(); mExternalStorageDir = Environment.getExternalStorageDirectory(); mSystemCacheDir = Environment.getDownloadCacheDirectory(); startThreadToCleanupDatabaseAndPurgeFileSystem(); @@ -419,14 +419,8 @@ class StorageManager { int numDelete = cursor.getCount() - Constants.MAX_DOWNLOADS; int columnId = cursor.getColumnIndexOrThrow(Downloads.Impl._ID); while (numDelete > 0) { - long id = cursor.getLong(columnId); Uri downloadUri = ContentUris.withAppendedId( - Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id); - if (Constants.LOGV) { - Log.i(Constants.TAG, "in trimDatabase, deleing _id: " + id + - ", file: " + - cursor.getString(cursor.getColumnIndex(Downloads.Impl._DATA))); - } + Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, cursor.getLong(columnId)); mContext.getContentResolver().delete(downloadUri, null, null); if (!cursor.moveToNext()) { break; |