diff options
author | Ian Pedowitz <ijpedowitz@google.com> | 2015-06-23 00:14:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-23 00:14:08 +0000 |
commit | e6289de574d6a4ebed776e156949aa3fd73f72c5 (patch) | |
tree | 22f18b635f0efed0643275afb784af31d1f8ab27 /packages/Shell | |
parent | 2df593e1730b8db843d64e7c78e4f4c309ec954f (diff) | |
parent | c16a26a2b947d4cec0dd87d7b6bf266fd9918fbc (diff) | |
download | frameworks_base-e6289de574d6a4ebed776e156949aa3fd73f72c5.zip frameworks_base-e6289de574d6a4ebed776e156949aa3fd73f72c5.tar.gz frameworks_base-e6289de574d6a4ebed776e156949aa3fd73f72c5.tar.bz2 |
am c16a26a2: Merge "Renaming bugreport.txt to bugreportFile.getName()" into mnc-dev
* commit 'c16a26a2b947d4cec0dd87d7b6bf266fd9918fbc':
Renaming bugreport.txt to bugreportFile.getName()
Diffstat (limited to 'packages/Shell')
-rw-r--r-- | packages/Shell/src/com/android/shell/BugreportReceiver.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class BugreportReceiver extends BroadcastReceiver { 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"); |