Merge "Delete bugreport file on bugreport cancel" into rvc-dev am: 8f08b1cd40 am: b05f53a234 am: 02bcf0e9b2

Change-Id: I9de721f6fdddbb572c5c7c5068c14fffa44ceae4

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);
         }
@@ -1972,6 +1973,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.