Merge "Set "isdrm" info in Mediastore"

2012-12-21 13:34:41 -08:00
parent 88fe4ebc0b 59c14048bf
commit c8db3b8ae3
1 changed files with 2 additions and 1 deletions
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -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;