diff options
| author | Elliott Hughes <enh@google.com> | 2013-05-06 14:16:44 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-05-06 14:16:44 -0700 |
| commit | 614d365088a1959ad44831fa9b1065ecbd4eefb8 (patch) | |
| tree | 0d56177d1f4835610c4b14fd0b6634c4c9674bb2 /src/com/android/gallery3d/util | |
| parent | 4a26d5e3cce401e2683190597e1e50b90f9900d8 (diff) | |
| parent | f959df75e30697a1276d3bc47ffa59104733f7ce (diff) | |
| download | android_packages_apps_Gallery2-614d365088a1959ad44831fa9b1065ecbd4eefb8.tar.gz android_packages_apps_Gallery2-614d365088a1959ad44831fa9b1065ecbd4eefb8.tar.bz2 android_packages_apps_Gallery2-614d365088a1959ad44831fa9b1065ecbd4eefb8.zip | |
resolved conflicts for merge of f959df75 to jb-mr2-dev-plus-aosp
Change-Id: Ic56346cb59b2817482c3c33a2bcd1d552dd432da
Diffstat (limited to 'src/com/android/gallery3d/util')
| -rw-r--r-- | src/com/android/gallery3d/util/SaveVideoFileUtils.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/util/SaveVideoFileUtils.java b/src/com/android/gallery3d/util/SaveVideoFileUtils.java index c281dd3e7..9e8f73a3d 100644 --- a/src/com/android/gallery3d/util/SaveVideoFileUtils.java +++ b/src/com/android/gallery3d/util/SaveVideoFileUtils.java @@ -25,8 +25,8 @@ import android.provider.MediaStore.Video; import android.provider.MediaStore.Video.VideoColumns; import java.io.File; -import java.sql.Date; import java.text.SimpleDateFormat; +import java.util.Date; public class SaveVideoFileUtils { // Copy from SaveCopyTask.java in terms of how to handle the destination @@ -50,8 +50,7 @@ public class SaveVideoFileUtils { } else { dstFileInfo.mFolderName = dstFileInfo.mDirectory.getName(); } - dstFileInfo.mFileName = new SimpleDateFormat(fileNameFormat).format( - new Date(System.currentTimeMillis())); + dstFileInfo.mFileName = new SimpleDateFormat(fileNameFormat).format(new Date()); dstFileInfo.mFile = new File(dstFileInfo.mDirectory, dstFileInfo.mFileName + ".mp4"); return dstFileInfo; |