diff options
| author | Felipe Leme <felipeal@google.com> | 2015-07-15 22:56:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:56:46 +0000 |
| commit | 1bcd49a9ebae6a82d601449dd182a18948803dd9 (patch) | |
| tree | aed27217af0d4d4a49a83cbde9b420e2118b2b55 /packages/Shell | |
| parent | de5cc88306cccdfe998ffafed4830b5db45b2ffd (diff) | |
| parent | 2ac41a902eb4e2af32ff4063dca03b656baa860f (diff) | |
| download | frameworks_base-1bcd49a9ebae6a82d601449dd182a18948803dd9.zip frameworks_base-1bcd49a9ebae6a82d601449dd182a18948803dd9.tar.gz frameworks_base-1bcd49a9ebae6a82d601449dd182a18948803dd9.tar.bz2 | |
am 2ac41a90: 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 '2ac41a902eb4e2af32ff4063dca03b656baa860f':
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"); |