diff options
| author | Ray Chen <raychen@google.com> | 2009-12-01 17:08:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-01 17:08:54 -0800 |
| commit | 6f762b2d8475f9e2b05340b5300e969718a482e6 (patch) | |
| tree | c8a761a6962e3327f7c52225b1d31902dff91386 /media/java | |
| parent | 25f2b2fad25670229f9505e03bd5aa8f74148440 (diff) | |
| parent | f27eb3264d4b5d3fd154834a709a9a53cc878b58 (diff) | |
| download | frameworks_base-6f762b2d8475f9e2b05340b5300e969718a482e6.zip frameworks_base-6f762b2d8475f9e2b05340b5300e969718a482e6.tar.gz frameworks_base-6f762b2d8475f9e2b05340b5300e969718a482e6.tar.bz2 | |
am f27eb326: Merge change I0b6ee9fc into eclair
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-plus-aosp
* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index da25f97..079b4c3 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -640,13 +640,13 @@ public class MediaScanner map.put(Video.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaFile.UNKNOWN_STRING)); map.put(Video.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING)); map.put(Video.Media.DURATION, mDuration); - map.put(Video.Media.DATE_TAKEN, mLastModified); + map.put(Video.Media.DATE_TAKEN, mLastModified * 1000); // FIXME - add RESOLUTION } else if (MediaFile.isImageFileType(mFileType)) { // FIXME - add DESCRIPTION // DATE_TAKEN will be overridden later if this is a JPEG image whose EXIF data // contains date time information. - map.put(Images.Media.DATE_TAKEN, mLastModified); + map.put(Images.Media.DATE_TAKEN, mLastModified * 1000); } else if (MediaFile.isAudioFileType(mFileType)) { map.put(Audio.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaFile.UNKNOWN_STRING)); map.put(Audio.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING)); @@ -746,7 +746,7 @@ public class MediaScanner long time = exif.getDateTime(); if (time != -1) { - values.put(Images.Media.DATE_TAKEN, time); + values.put(Images.Media.DATE_TAKEN, time * 1000); } int orientation = exif.getAttributeInt( |