From 05df33ea748d1c497206302f62886f73c7ff1f93 Mon Sep 17 00:00:00 2001 From: Ray Chen Date: Tue, 17 Nov 2009 10:34:35 -0800 Subject: [PATCH] Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing images/videos to database. --- media/java/android/media/MediaScanner.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index afdc8f77c2679..da25f9764b8c0 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -640,10 +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); // FIXME - add RESOLUTION } else if (MediaFile.isImageFileType(mFileType)) { // FIXME - add DESCRIPTION - // map.put(field, value); + // 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); } 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));