Merge "Delete bugreport file on bugreport cancel" into rvc-dev am: 8f08b1cd40... (c04bf81a) · Commits · e / os / android_frameworks_base

packages/Shell/src/com/android/shell/BugreportProgressService.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -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.