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

Commit 7eca5014 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING"

parents 1a08ad1c 9a488b44

core/java/android/provider/MediaStore.java

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ public final class MediaStore { 
        public static String keyFor(String name) {

            if (name != null)  {

                boolean sortfirst = false;

                if (name.equals(android.media.MediaFile.UNKNOWN_STRING)) {

                if (name.equals(UNKNOWN_STRING)) {

                    return "\001";

                }

                // Check if the first character is \001. We use this to

media/java/android/media/MediaFile.java

+0 −2
Original line number Diff line number Diff line
@@ -155,8 +155,6 @@ public class MediaFile { 
        sFileExtensions = builder.toString();

    }

    

    public static final String UNKNOWN_STRING = "<unknown>";

    

    public static boolean isAudioFileType(int fileType) {

        return ((fileType >= FIRST_AUDIO_FILE_TYPE &&

                fileType <= LAST_AUDIO_FILE_TYPE) ||

media/java/android/media/MediaScanner.java

+5 −5
Original line number Diff line number Diff line
@@ -637,8 +637,8 @@ public class MediaScanner 
            map.put(MediaStore.MediaColumns.MIME_TYPE, mMimeType);



            if (MediaFile.isVideoFileType(mFileType)) {

                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.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
@@ -648,8 +648,8 @@ public class MediaScanner 
                // 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 : MediaFile.UNKNOWN_STRING));

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

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

                map.put(Audio.Media.COMPOSER, mComposer);

                if (mYear != 0) {

                    map.put(Audio.Media.YEAR, mYear);
@@ -705,7 +705,7 @@ public class MediaScanner 
                values.put(MediaStore.MediaColumns.TITLE, title);

            }

            String album = values.getAsString(Audio.Media.ALBUM);

            if (MediaFile.UNKNOWN_STRING.equals(album)) {

            if (MediaStore.UNKNOWN_STRING.equals(album)) {

                album = values.getAsString(MediaStore.MediaColumns.DATA);

                // extract last path segment before file name

                int lastSlash = album.lastIndexOf('/');