commit b4ca6ef9941701502a9ea4d298d7fe5602ba8e7a
author Ray Chen <raychen@google.com> Tue Mar 09 14:23:23 2010 -0800
committer Ray Chen <raychen@google.com> Tue Mar 09 14:23:23 2010 -0800
tree 65d23e1cdb14571998cb415e81a614f1204da3fb
parent 7e93cde228f90d4ee57457508a566d461f02a656

Avoid overriding DATE_TAKEN by unreliable file time. MediaProvider will calculate it if needed.

Change-Id: I05cb8628f2333c26de5c05ee1c7676b8f79a5e9a

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 1f02608..1047fa4 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -630,13 +630,9 @@
                 map.put(Video.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaStore.UNKNOWN_STRING));
                 map.put(Video.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaStore.UNKNOWN_STRING));
                 map.put(Video.Media.DURATION, mDuration);
-                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 * 1000);
             } else if (MediaFile.isAudioFileType(mFileType)) {
                 map.put(Audio.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaStore.UNKNOWN_STRING));
                 map.put(Audio.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaStore.UNKNOWN_STRING));