Merge "Delete bugreport file on bugreport cancel" into rvc-dev

1 files changed, 9 insertions, 0 deletions

diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java
index a1376c3203f5..5d363f34bc67 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);
         }
@@ -1973,6 +1974,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.
          */