summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2015-07-15 19:00:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-15 19:00:58 +0000
commit68fd7c798d213bbe304775b13d775ee868abb448 (patch)
treed0c698a77438fbe61e9f5a2dfb1d843a130a8952 /packages/Shell
parentd193916c83015d54466ad998fb9373f15da754a7 (diff)
parente28d7fc21c40eedcac35c7c00b6464fdf8e34b44 (diff)
downloadframeworks_base-68fd7c798d213bbe304775b13d775ee868abb448.zip
frameworks_base-68fd7c798d213bbe304775b13d775ee868abb448.tar.gz
frameworks_base-68fd7c798d213bbe304775b13d775ee868abb448.tar.bz2
Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/src/com/android/shell/BugreportReceiver.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Shell/src/com/android/shell/BugreportReceiver.java b/packages/Shell/src/com/android/shell/BugreportReceiver.java
index 6278650..d83b516 100644
--- a/packages/Shell/src/com/android/shell/BugreportReceiver.java
+++ b/packages/Shell/src/com/android/shell/BugreportReceiver.java
@@ -215,6 +215,7 @@ public class BugreportReceiver extends BroadcastReceiver {
ZipOutputStream zos = new ZipOutputStream(
new BufferedOutputStream(new FileOutputStream(bugreportZippedFile)))) {
ZipEntry entry = new ZipEntry(bugreportFile.getName());
+ entry.setTime(bugreportFile.lastModified());
zos.putNextEntry(entry);
int totalBytes = Streams.copy(is, zos);
Log.v(TAG, "size of original bugreport: " + totalBytes + " bytes");