diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-07 13:49:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-07 13:49:30 -0800 |
| commit | 7d96bafa59111d9ca735e5ef86dc0598f946b2be (patch) | |
| tree | d6884fdc83bd4042eb9faea43bfcbe77b3b9c86d /src | |
| parent | 2ce876d2d7000b0c3a1430c5f4932568090f5170 (diff) | |
| parent | f5699308bc41c39ccbb388feb00a248304f30c54 (diff) | |
| download | android_packages_providers_DownloadProvider-7d96bafa59111d9ca735e5ef86dc0598f946b2be.tar.gz android_packages_providers_DownloadProvider-7d96bafa59111d9ca735e5ef86dc0598f946b2be.tar.bz2 android_packages_providers_DownloadProvider-7d96bafa59111d9ca735e5ef86dc0598f946b2be.zip | |
Merge "downloadmanager should use "files" dir - not "cache" dir to store its files" into honeycomb
Diffstat (limited to 'src')
| -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, 10 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java index fefbe1d8..9aa0a309 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 + " for " - + mInfo.mUri); + Log.v(Constants.TAG, "downloaded " + innerState.mBytesSoFar + + ", file: " + mInfo.mFileName + ", uri: " + mInfo.mUri); } checkPausedOrCanceled(state); diff --git a/src/com/android/providers/downloads/StorageManager.java b/src/com/android/providers/downloads/StorageManager.java index d7d0a7ad..e17a3a39 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.getCacheDir(); + mDownloadDataDir = context.getFilesDir(); mExternalStorageDir = Environment.getExternalStorageDirectory(); mSystemCacheDir = Environment.getDownloadCacheDirectory(); startThreadToCleanupDatabaseAndPurgeFileSystem(); @@ -419,8 +419,14 @@ 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, cursor.getLong(columnId)); + 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))); + } mContext.getContentResolver().delete(downloadUri, null, null); if (!cursor.moveToNext()) { break; |