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

Commit edc1b064 authored by Ray Chen's avatar Ray Chen Committed by Android Git Automerger
Browse files

am ae9dd9b7: am b3f35041: Merge change I86db22ef into eclair 

Merge commit 'ae9dd9b7' into eclair-mr2-plus-aosp

* commit 'ae9dd9b7':
  Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
parents 95230656 ae9dd9b7

media/java/android/media/MediaScanner.java

+4 −1
Original line number Diff line number Diff line
@@ -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));