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

Merge "Delete empty bugreport files onError" into rvc-dev am: 873f59dc0e am: 8abcebf3e2 am: 24598b6af8

Browse Source 
Change-Id: I8c238843465ec2f3d400f76fe8e7b5231bfda5de
This commit is contained in:
Abhijeet Kaur
2020-04-07 10:19:33 +00:00
committed by Automerger Merge Worker
parent 4eb450df83 24598b6af8
commit 71837f5aa5
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,6 +363,7 @@ public class BugreportProgressService extends Service {
public void onError(@BugreportErrorCode int errorCode) { public void onError(@BugreportErrorCode int errorCode) {
synchronized (mLock) { synchronized (mLock) {
stopProgressLocked(mInfo.id); stopProgressLocked(mInfo.id);
mInfo.deleteEmptyFiles();
} }
Log.e(TAG, "Bugreport API callback onError() errorCode = " + errorCode); Log.e(TAG, "Bugreport API callback onError() errorCode = " + errorCode);
return; return;
@@ -1979,6 +1980,22 @@ public class BugreportProgressService extends Service {
bugreportFile.delete(); bugreportFile.delete();
} }
/**
* Deletes empty files for a given bugreport.
*/
private void deleteEmptyFiles() {
if (bugreportFile.length() == 0) {
Log.i(TAG, "Deleting empty bugreport file: " + bugreportFile);
bugreportFile.delete();
}
for (File file : screenshotFiles) {
if (file.length() == 0) {
Log.i(TAG, "Deleting empty screenshot file: " + file);
file.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.