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

Merge "Only try to add details to zip once." into nyc-dev am: 0304688 am: 01c93c4

Browse Source 
am: 80d5aef

* commit '80d5aef0517a899b3d00cfd19f45eff54c3927a2':
  Only try to add details to zip once.

Change-Id: I424225fafc8fbb249c69cc9dec2af97a3deae608
This commit is contained in:
Felipe Leme
2016-04-20 22:58:39 +00:00
committed by android-build-merger
parent 3c04484b8b 80d5aef051
commit 25b130b77b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)