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

Commit 92e1314a authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files



Bug: 5025615

Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 4a8df318
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -283,6 +283,13 @@ public final class MediaStore {
         */
        public static final String IS_DRM = "is_drm";

        /**
         * Used by the media scanner to suppress files from being processed as media files.
         *
         * <P>Type: INTEGER (boolean)</P>
         * @hide
         */
        public static final String NO_MEDIA = "no_media";
     }

    /**
+3 −1
Original line number Diff line number Diff line
@@ -707,7 +707,9 @@ public class MediaScanner
            map.put(MediaStore.MediaColumns.MIME_TYPE, mMimeType);
            map.put(MediaStore.MediaColumns.IS_DRM, mIsDrm);

            if (!mNoMedia) {
            if (mNoMedia) {
                map.put(MediaStore.MediaColumns.NO_MEDIA, true);
            } else {
                if (MediaFile.isVideoFileType(mFileType)) {
                    map.put(Video.Media.ARTIST, (mArtist != null && mArtist.length() > 0
                            ? mArtist : MediaStore.UNKNOWN_STRING));