commit c16a26a2b947d4cec0dd87d7b6bf266fd9918fbc
author Ian Pedowitz <ijpedowitz@google.com> Mon Jun 22 23:01:08 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 22 23:01:10 2015 +0000
tree 8b1ccf39e0556f3558fd28c42cb63f9f9ba2113e
parent b94daae3fdab6771310a510dd195dd622d063cb2
parent bd82c7d364ac9b38b4e6b22cfa9634185d04b836

Merge "Renaming bugreport.txt to bugreportFile.getName()" into mnc-dev

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

diff --git a/packages/Shell/src/com/android/shell/BugreportReceiver.java b/packages/Shell/src/com/android/shell/BugreportReceiver.java
index 0c84fa1..6278650 100644
--- a/packages/Shell/src/com/android/shell/BugreportReceiver.java
+++ b/packages/Shell/src/com/android/shell/BugreportReceiver.java
@@ -214,7 +214,7 @@
         try (InputStream is = new FileInputStream(bugreportFile);
             ZipOutputStream zos = new ZipOutputStream(
                 new BufferedOutputStream(new FileOutputStream(bugreportZippedFile)))) {
-            ZipEntry entry = new ZipEntry("bugreport.txt");
+            ZipEntry entry = new ZipEntry(bugreportFile.getName());
             zos.putNextEntry(entry);
             int totalBytes = Streams.copy(is, zos);
             Log.v(TAG, "size of original bugreport: " + totalBytes + " bytes");