Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I935b9694f3885d28f3d3af62459a91fb354ad6f2

diff --git a/src/com/android/gallery3d/filtershow/crop/CropLoader.java b/src/com/android/gallery3d/filtershow/crop/CropLoader.java
index fc461f5..430647e 100644 (file)
--- a/src/com/android/gallery3d/filtershow/crop/CropLoader.java
+++ b/src/com/android/gallery3d/filtershow/crop/CropLoader.java
@@ -38,8 +38,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.sql.Date;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * This class contains static methods for loading a bitmap and

diff --git a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
index 008cb57..6255f31 100644 (file)
--- a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
+++ b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
@@ -41,8 +41,8 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.sql.Date;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.TimeZone;
 
 /**
@@ -84,8 +84,7 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> {
             this.destinationFile = destination;
         }
 
-        saveFileName = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date(
-                System.currentTimeMillis()));
+        saveFileName = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date());
     }
 
     public static File getFinalSaveDirectory(Context context, Uri sourceUri) {
@@ -102,8 +101,7 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> {
 
     public static File getNewFile(Context context, Uri sourceUri) {
         File saveDirectory = getFinalSaveDirectory(context, sourceUri);
-        String filename = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date(
-                System.currentTimeMillis()));
+        String filename = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date());
         return new File(saveDirectory, filename + ".JPG");
     }
 

diff --git a/src/com/android/gallery3d/util/SaveVideoFileUtils.java b/src/com/android/gallery3d/util/SaveVideoFileUtils.java
index c281dd3..9e8f73a 100644 (file)
--- 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;