diff options
| author | Felipe Leme <felipeal@google.com> | 2015-07-15 22:26:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:26:47 +0000 |
| commit | d9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba (patch) | |
| tree | 09a0c0e65148198d12035520a03c61e19b36017e /packages/Shell | |
| parent | 4a56983fa707985fe5e5ab050acd7306e123d075 (diff) | |
| parent | 68fd7c798d213bbe304775b13d775ee868abb448 (diff) | |
| download | frameworks_base-d9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba.zip frameworks_base-d9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba.tar.gz frameworks_base-d9ab0ca287a9ab1b5af19d70cb9b13e0e16cfcba.tar.bz2 | |
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 '68fd7c798d213bbe304775b13d775ee868abb448':
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.java | 1 |
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"); |