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

Commit c8db3b8a authored by James Dong's avatar James Dong Committed by Gerrit Code Review
Browse files

Merge "Set "isdrm" info in Mediastore"

parents 88fe4ebc 59c14048

media/java/android/media/MediaScanner.java

+2 −1
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ public class MediaScanner 
            mMimeType = mimeType;

            mFileType = 0;

            mFileSize = fileSize;

            mIsDrm = false;



            if (!isDirectory) {

                if (!noMedia && isNoMediaFile(path)) {
@@ -503,7 +504,6 @@ public class MediaScanner 
            mLastModified = lastModified;

            mWriter = null;

            mCompilation = 0;

            mIsDrm = false;

            mWidth = 0;

            mHeight = 0;
@@ -1039,6 +1039,7 @@ public class MediaScanner 
            }



            if (mDrmManagerClient.canHandle(path, null)) {

                mIsDrm = true;

                String drmMimetype = mDrmManagerClient.getOriginalMimeType(path);

                if (drmMimetype != null) {

                    mMimeType = drmMimetype;