Merge "Delete empty bugreport files onError" into rvc-dev am: 873f59dc0e am: 8abcebf3e2 (24598b6a) · Commits · e / os / android_frameworks_base

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -363,6 +363,7 @@ public class BugreportProgressService extends Service {
		public void onError(@BugreportErrorCode int errorCode) {
		synchronized (mLock) {
		stopProgressLocked(mInfo.id);
		mInfo.deleteEmptyFiles();
		}
		Log.e(TAG, "Bugreport API callback onError() errorCode = " + errorCode);
		return;
		@@ -1979,6 +1980,22 @@ public class BugreportProgressService extends Service {
		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
		* {@code initialName} if user has changed it.