Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ia14ca511c6e1622942fd54abc4147824c5dae283
This commit is contained in:
TreeHugger Robot
2020-03-31 20:11:59 +00:00
committed by Automerger Merge Worker
parent 4115d306bb 2df8938ac7
commit c04bf81ab6
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -817,6 +817,7 @@ public class BugreportProgressService extends Service {
Log.i(TAG, "Cancelling bugreport service (ID=" + id + ") on user's request"); Log.i(TAG, "Cancelling bugreport service (ID=" + id + ") on user's request");
mBugreportManager.cancelBugreport(); mBugreportManager.cancelBugreport();
info.deleteScreenshots(); info.deleteScreenshots();
info.deleteBugreportFile();
} }
stopProgressLocked(id); 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 * Rename all screenshots files so that they contain the new {@code name} instead of the
* {@code initialName} if user has changed it. * {@code initialName} if user has changed it.