More slogging around download deletion.
Jeff Sharkey [Fri, 20 Apr 2012 03:51:24 +0000 (20:51 -0700)]
Bug: 6362988
Change-Id: Iab4b86cfcaa6aeed6466f88ff49eb935f96db495

src/com/android/providers/downloads/DownloadService.java
src/com/android/providers/downloads/DownloadThread.java
src/com/android/providers/downloads/StorageManager.java

index f77a3bf..3b566f8 100644 (file)
@@ -16,6 +16,8 @@
 
 package com.android.providers.downloads;
 
+import static com.android.providers.downloads.Constants.TAG;
+
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -36,6 +38,7 @@ import android.os.RemoteException;
 import android.provider.Downloads;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Slog;
 
 import com.android.internal.util.IndentingPrintWriter;
 import com.google.android.collect.Maps;
@@ -480,6 +483,7 @@ public class DownloadService extends Service {
             info.mStatus = Downloads.Impl.STATUS_CANCELED;
         }
         if (info.mDestination != Downloads.Impl.DESTINATION_EXTERNAL && info.mFileName != null) {
+            Slog.d(TAG, "deleteDownloadLocked() deleting " + info.mFileName);
             new File(info.mFileName).delete();
         }
         mSystemFacade.cancelNotification(info.mId);
@@ -555,7 +559,7 @@ public class DownloadService extends Service {
     private void deleteFileIfExists(String path) {
         try {
             if (!TextUtils.isEmpty(path)) {
-                Log.i(Constants.TAG, "deleting " + path);
+                Slog.d(TAG, "deleteFileIfExists() deleting " + path);
                 File file = new File(path);
                 file.delete();
             }
index 4de5134..bd91eaa 100644 (file)
@@ -16,6 +16,8 @@
 
 package com.android.providers.downloads;
 
+import static com.android.providers.downloads.Constants.TAG;
+
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -31,6 +33,7 @@ import android.provider.Downloads;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
+import android.util.Slog;
 
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
@@ -327,6 +330,7 @@ public class DownloadThread extends Thread {
 
         closeDestination(state);
         if (state.mFilename != null && Downloads.Impl.isStatusError(finalStatus)) {
+            Slog.d(TAG, "cleanupDestination() deleting " + state.mFilename);
             new File(state.mFilename).delete();
             state.mFilename = null;
         }
@@ -843,6 +847,8 @@ public class DownloadThread extends Thread {
                 long fileLength = f.length();
                 if (fileLength == 0) {
                     // The download hadn't actually started, we can restart from scratch
+                    Slog.d(TAG, "setupDestinationFile() found fileLength=0, deleting "
+                            + state.mFilename);
                     f.delete();
                     state.mFilename = null;
                     if (Constants.LOGV) {
@@ -851,6 +857,8 @@ public class DownloadThread extends Thread {
                     }
                 } else if (mInfo.mETag == null && !mInfo.mNoIntegrity) {
                     // This should've been caught upon failure
+                    Slog.d(TAG, "setupDestinationFile() unable to resume download, deleting "
+                            + state.mFilename);
                     f.delete();
                     throw new StopRequestException(Downloads.Impl.STATUS_CANNOT_RESUME,
                             "Trying to resume a download that can't be resumed");
index ab3b6ae..4f3af5c 100644 (file)
@@ -27,6 +27,7 @@ import android.os.StatFs;
 import android.provider.Downloads;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Slog;
 
 import com.android.internal.R;
 
@@ -331,7 +332,7 @@ class StorageManager {
             while (cursor.moveToNext() && totalFreed < targetBytes) {
                 File file = new File(cursor.getString(cursor.getColumnIndex(Downloads.Impl._DATA)));
                 if (true || Constants.LOGV) {
-                    Log.i(Constants.TAG, "purging " + file.getAbsolutePath() + " for " +
+                    Slog.d(Constants.TAG, "purging " + file.getAbsolutePath() + " for " +
                             file.length() + " bytes");
                 }
                 totalFreed += file.length();
@@ -403,7 +404,7 @@ class StorageManager {
                 continue;
             }
             if (true || Constants.LOGV) {
-                Log.i(Constants.TAG, "deleting spurious file " + file.getAbsolutePath());
+                Slog.d(Constants.TAG, "deleting spurious file " + file.getAbsolutePath());
             }
             file.delete();
         }