Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f0bf83e authored by Ray Chen's avatar Ray Chen Committed by Android (Google) Code Review
Browse files

Merge "Avoid overriding DATE_TAKEN by unreliable file time. MediaProvider will... 

Merge "Avoid overriding DATE_TAKEN by unreliable file time. MediaProvider will calculate it if needed."
parents 158a2ce5 b4ca6ef9

media/java/android/media/MediaScanner.java

+0 −4
Original line number Diff line number Diff line
@@ -630,13 +630,9 @@ public class MediaScanner 
                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));