diff options
3 files changed, 5 insertions, 11 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; diff --git a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java index fac905f8..c3ac8904 100644 --- a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java @@ -65,7 +65,7 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti Integer.toString(Downloads.Impl.DESTINATION_CACHE_PARTITION)); runUntilStatus(downloadUri, Downloads.Impl.STATUS_SUCCESS); assertEquals(FILE_CONTENT, getDownloadContents(downloadUri)); - assertStartsWith(getContext().getFilesDir().getAbsolutePath(), + assertStartsWith(getContext().getCacheDir().getAbsolutePath(), getDownloadFilename(downloadUri)); } |