diff options
-rw-r--r-- | media/java/android/media/ExifInterface.java | 3 | ||||
-rw-r--r-- | media/java/android/media/MediaScanner.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index c49ad5c..ba7e9bb 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -62,7 +62,8 @@ public class ExifInterface { static { System.loadLibrary("exif"); sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss"); - sFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); + //TODO: uncomment this when our EXIF datetime is encoded as UTC + //sFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); } private String mFilename; diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 079b4c3..4296afb 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -746,7 +746,7 @@ public class MediaScanner long time = exif.getDateTime(); if (time != -1) { - values.put(Images.Media.DATE_TAKEN, time * 1000); + values.put(Images.Media.DATE_TAKEN, time); } int orientation = exif.getAttributeInt( |