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

Commit cf1df194 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore" 

* commit '0c1e566f':
  Set "isdrm" info in Mediastore
parents b3c81e3f 0c1e566f

media/java/android/media/MediaScanner.java

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

            mFileType = 0;

            mFileSize = fileSize;

            mIsDrm = false;



            if (!isDirectory) {

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

            mWriter = null;

            mCompilation = 0;

            mIsDrm = false;

            mWidth = 0;

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



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

                mIsDrm = true;

                String drmMimetype = mDrmManagerClient.getOriginalMimeType(path);

                if (drmMimetype != null) {

                    mMimeType = drmMimetype;