diff options
| author | James Dong <jdong@google.com> | 2012-12-28 09:47:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-28 09:47:41 -0800 |
| commit | cf1df1944832d43aa95d3d8f6a84bea31096ad65 (patch) | |
| tree | 2355b2f434f710598fa715943e89db7feea5fd2c /media/java | |
| parent | b3c81e3f6c3d41ab6220ba91808b04d758dccba1 (diff) | |
| parent | 0c1e566f97a39dd79e563afe953de8879ef66bd9 (diff) | |
| download | frameworks_base-cf1df1944832d43aa95d3d8f6a84bea31096ad65.zip frameworks_base-cf1df1944832d43aa95d3d8f6a84bea31096ad65.tar.gz frameworks_base-cf1df1944832d43aa95d3d8f6a84bea31096ad65.tar.bz2 | |
am 0c1e566f: am c8db3b8a: Merge "Set "isdrm" info in Mediastore"
* commit '0c1e566f97a39dd79e563afe953de8879ef66bd9':
Set "isdrm" info in Mediastore
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 423a109..fbbcb0a 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -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; |