diff options
| author | Ray Chen <raychen@google.com> | 2009-12-04 12:02:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-04 12:02:04 -0800 |
| commit | da32419584d6761bfcbcad6a72275dbc3cea50fe (patch) | |
| tree | 5340f97828dc101e4dc464e0a2bf78aceb081d16 /media/java | |
| parent | a1a68a4a2d1b1c48b3dc98638cb2e498b6f65408 (diff) | |
| parent | 8a576620cdc7257fc026026c77f7c946bfb760d1 (diff) | |
| download | frameworks_base-da32419584d6761bfcbcad6a72275dbc3cea50fe.zip frameworks_base-da32419584d6761bfcbcad6a72275dbc3cea50fe.tar.gz frameworks_base-da32419584d6761bfcbcad6a72275dbc3cea50fe.tar.bz2 | |
am 8a576620: am 052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. http://b/2297371
Merge commit '8a576620cdc7257fc026026c77f7c946bfb760d1' into eclair-mr2-plus-aosp
* commit '8a576620cdc7257fc026026c77f7c946bfb760d1':
Images.Media.DATE_TAKEN should be in milliseconds.
Diffstat (limited to 'media/java')
| -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( |