summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2015-07-15 22:45:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-15 22:45:11 +0000
commit2ac41a902eb4e2af32ff4063dca03b656baa860f (patch)
tree04957f65c08130da86138f5cdfa666ad1ba44cd1 /packages/Shell
parentf57b5e6f23b9ec6f98d4af75072b87b09303e62d (diff)
parentd9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba (diff)
downloadframeworks_base-2ac41a902eb4e2af32ff4063dca03b656baa860f.zip
frameworks_base-2ac41a902eb4e2af32ff4063dca03b656baa860f.tar.gz
frameworks_base-2ac41a902eb4e2af32ff4063dca03b656baa860f.tar.bz2
am d9ab0ca2: am 68fd7c79: 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
* commit 'd9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba': Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
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");