summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2015-06-22 23:01:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-22 23:01:10 +0000
commitc16a26a2b947d4cec0dd87d7b6bf266fd9918fbc (patch)
tree8b1ccf39e0556f3558fd28c42cb63f9f9ba2113e /packages/Shell
parentb94daae3fdab6771310a510dd195dd622d063cb2 (diff)
parentbd82c7d364ac9b38b4e6b22cfa9634185d04b836 (diff)
downloadframeworks_base-c16a26a2b947d4cec0dd87d7b6bf266fd9918fbc.zip
frameworks_base-c16a26a2b947d4cec0dd87d7b6bf266fd9918fbc.tar.gz
frameworks_base-c16a26a2b947d4cec0dd87d7b6bf266fd9918fbc.tar.bz2
Merge "Renaming bugreport.txt to bugreportFile.getName()" into mnc-dev
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/src/com/android/shell/BugreportReceiver.java2
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");