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

Browse Source 
am: 0304688

* commit '03046888822d07ec020eb7a2f685be4f7bcded31':
  Only try to add details to zip once.

Change-Id: I629618cc5cf105584ebf911b3de1b6649f1c59c6
This commit is contained in:
Felipe Leme
2016-04-20 21:13:17 +00:00
committed by android-build-merger
parent dde619510c 0304688882
commit 39dd4939ab
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, "title.txt", info.title);
addEntry(zos, "description.txt", info.description); addEntry(zos, "description.txt", info.description);
} catch (IOException e) { } catch (IOException e) {
info.addingDetailsToZip = false;
Log.e(TAG, "exception zipping file " + tmpZip, e); Log.e(TAG, "exception zipping file " + tmpZip, e);
return; 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)) { if (!tmpZip.renameTo(info.bugreportFile)) {
Log.e(TAG, "Could not rename " + tmpZip + " to " + 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) private static void addEntry(ZipOutputStream zos, String entry, String text)