From 982b1047556b3ee0b950e4adee2abafa28bc02fd Mon Sep 17 00:00:00 2001 From: Abhijeet Kaur Date: Mon, 30 Mar 2020 17:18:00 +0100 Subject: Delete bugreport file on bugreport cancel Note: bugreport Cancel is not the same as bugreport onError. Files are not deleted onError, as it still has some information before the bugreport crashed/stopped. Bugreport Cancel is triggered by the user, hence clean up all the files. Bug: 146994281 Test: Cancel interactive bugreport from UI, deletes the current bugreport files Change-Id: I2606e491cbaa20eaa60980e98af56a194bae2280 --- .../Shell/src/com/android/shell/BugreportProgressService.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packages/Shell/src') diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 64e52376effd..fa3ba688afc3 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -817,6 +817,7 @@ public class BugreportProgressService extends Service { Log.i(TAG, "Cancelling bugreport service (ID=" + id + ") on user's request"); mBugreportManager.cancelBugreport(); info.deleteScreenshots(); + info.deleteBugreportFile(); } stopProgressLocked(id); } @@ -1967,6 +1968,14 @@ public class BugreportProgressService extends Service { } } + /** + * Deletes bugreport file for a given bugreport. + */ + private void deleteBugreportFile() { + Log.i(TAG, "Deleting bugreport file " + bugreportFile); + bugreportFile.delete(); + } + /** * Rename all screenshots files so that they contain the new {@code name} instead of the * {@code initialName} if user has changed it. -- cgit v1.2.3