Merge "Only try to add details to zip once." into nyc-dev am: 0304688 am: 01c93c4 (25b130b7) · Commits · e / os / android_frameworks_base

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -1084,16 +1084,17 @@ public class BugreportProgressService extends Service {
		addEntry(zos, "title.txt", info.title);
		addEntry(zos, "description.txt", info.description);
		} catch (IOException e) {
		info.addingDetailsToZip = false;
		Log.e(TAG, "exception zipping file " + tmpZip, e);
		return;
		} finally {
		// Make sure it only tries to add details once, even it fails the first time.
		info.addedDetailsToZip = true;
		info.addingDetailsToZip = false;
		}

		if (!tmpZip.renameTo(info.bugreportFile)) {
		Log.e(TAG, "Could not rename " + tmpZip + " to " + info.bugreportFile);
		}
		info.addedDetailsToZip = true;
		info.addingDetailsToZip = false;
		}

		private static void addEntry(ZipOutputStream zos, String entry, String text)