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

Commit 05df33ea authored by Ray Chen's avatar Ray Chen
Browse files

Fix issue 2265955 Use dateCreated when dateTaken isn't valid when writing... 

Fix issue 2265955	Use dateCreated when dateTaken isn't valid when writing images/videos to database.
parent f0166e4d

media/java/android/media/MediaScanner.java

+4 −1
Original line number Original line 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.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.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING));

                map.put(Video.Media.DURATION, mDuration);

                map.put(Video.Media.DURATION, mDuration);

                map.put(Video.Media.DATE_TAKEN, mLastModified);

                // FIXME - add RESOLUTION

                // FIXME - add RESOLUTION

            } else if (MediaFile.isImageFileType(mFileType)) {

            } else if (MediaFile.isImageFileType(mFileType)) {

                // FIXME - add DESCRIPTION

                // 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)) {

            } else if (MediaFile.isAudioFileType(mFileType)) {

                map.put(Audio.Media.ARTIST, (mArtist != null && mArtist.length() > 0 ? mArtist : MediaFile.UNKNOWN_STRING));

                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));

                map.put(Audio.Media.ALBUM, (mAlbum != null && mAlbum.length() > 0 ? mAlbum : MediaFile.UNKNOWN_STRING));