From a57f0e6b14754aa39e8454d82b9fa08e3f2b53a5 Mon Sep 17 00:00:00 2001 From: Michal Karpinski Date: Wed, 17 Feb 2016 13:47:17 +0000 Subject: [PATCH] Be less aggressive in removing old remote bugreport files Always keep all the files of the remote bugreport operation and keep them for at least a day. Bug: 27215341 Change-Id: I514956004bf982e868a87b39c705d7c4a4a7b001 --- .../com/android/shell/RemoteBugreportReceiver.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java b/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java index 6f783a1fbabfe..be54b43e0524d 100644 --- a/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java +++ b/packages/Shell/src/com/android/shell/RemoteBugreportReceiver.java @@ -30,6 +30,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.UserHandle; +import android.text.format.DateUtils; /** * Receiver that handles finished remote bugreports, by re-sending @@ -43,12 +44,16 @@ public class RemoteBugreportReceiver extends BroadcastReceiver { private static final String EXTRA_REMOTE_BUGREPORT_HASH = "android.intent.extra.REMOTE_BUGREPORT_HASH"; - /** Always keep just the last remote bugreport zip file */ - private static final int MIN_KEEP_COUNT = 1; + /** Always keep just the last remote bugreport's files around. */ + private static final int REMOTE_BUGREPORT_FILES_AMOUNT = 3; + + /** Always keep remote bugreport files created in the last day. */ + private static final long MIN_KEEP_AGE = DateUtils.DAY_IN_MILLIS; @Override public void onReceive(Context context, Intent intent) { - cleanupOldFiles(this, intent, INTENT_REMOTE_BUGREPORT_FINISHED, MIN_KEEP_COUNT, 0); + cleanupOldFiles(this, intent, INTENT_REMOTE_BUGREPORT_FINISHED, + REMOTE_BUGREPORT_FILES_AMOUNT, MIN_KEEP_AGE); final File bugreportFile = getFileExtra(intent, EXTRA_BUGREPORT); final Uri bugreportUri = getUri(context, bugreportFile);