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

Commit 2adf53c7 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "MediaScanner: Fix UnsupportedOperationException when scanning internal media"

parents c0f660e3 43b076bb

media/java/android/media/MediaScanner.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -307,7 +307,7 @@ public class MediaScanner 
    private Uri mThumbsUri;

    private Uri mThumbsUri;

    private Uri mPlaylistsUri;

    private Uri mPlaylistsUri;

    private Uri mFilesUri;

    private Uri mFilesUri;

    private boolean mProcessPlaylists;

    private boolean mProcessPlaylists, mProcessGenres;

    private int mMtpObjectHandle;

    private int mMtpObjectHandle;





    private final String mExternalStoragePath;

    private final String mExternalStoragePath;
@@ -612,7 +612,8 @@ public class MediaScanner 
                mAlbum = value.trim();

                mAlbum = value.trim();

            } else if (name.equalsIgnoreCase("composer") || name.startsWith("composer;")) {

            } else if (name.equalsIgnoreCase("composer") || name.startsWith("composer;")) {

                mComposer = value.trim();

                mComposer = value.trim();

            } else if (name.equalsIgnoreCase("genre") || name.startsWith("genre;")) {

            } else if (mProcessGenres &&

                    (name.equalsIgnoreCase("genre") || name.startsWith("genre;"))) {

                mGenre = getGenreName(value);

                mGenre = getGenreName(value);

            } else if (name.equalsIgnoreCase("year") || name.startsWith("year;")) {

            } else if (name.equalsIgnoreCase("year") || name.startsWith("year;")) {

                mYear = parseSubstring(value, 0, 0);

                mYear = parseSubstring(value, 0, 0);
@@ -1151,6 +1152,7 @@ public class MediaScanner 
        if (!volumeName.equals("internal")) {

        if (!volumeName.equals("internal")) {

            // we only support playlists on external media

            // we only support playlists on external media

            mProcessPlaylists = true;

            mProcessPlaylists = true;

            mProcessGenres = true;

            mPlaylistsUri = Playlists.getContentUri(volumeName);

            mPlaylistsUri = Playlists.getContentUri(volumeName);





            mCaseInsensitivePaths = true;

            mCaseInsensitivePaths = true;