summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ray Chen <raychen@google.com> 2009-12-04 01:47:07 -0800
committer Ray Chen <raychen@google.com> 2009-12-04 11:51:25 -0800
commit052d9c8b414dc9eb1c70d849660592d9bc3b2644 (patch)
treee0a220fb7bedf85d66b4ec5146f0a36f4576e8dd
parent48a65d99cba33db3af2e05982a6825b883be2030 (diff)
Images.Media.DATE_TAKEN should be in milliseconds.
http://b/2297371
-rw-r--r--media/java/android/media/ExifInterface.java3
-rw-r--r--media/java/android/media/MediaScanner.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index c49ad5c33794..ba7e9bb8accc 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 079b4c36105c..4296afb3968b 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(