summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJan Bjernler <jan2.bjernler@sonymobile.com>2012-05-18 10:01:18 +0200
committerJohan Redestig <johan.redestig@sonymobile.com>2012-08-31 11:51:38 +0200
commit20c38ea9fd4024cc076c825f46cdfb34ffc090de (patch)
tree5d7ed6a424bb4aa2a89a12e0926a2ecf7a4c379d /media
parent0dab1a198e19c9993897b031d425a61a3bfec562 (diff)
downloadframeworks_base-20c38ea9fd4024cc076c825f46cdfb34ffc090de.zip
frameworks_base-20c38ea9fd4024cc076c825f46cdfb34ffc090de.tar.gz
frameworks_base-20c38ea9fd4024cc076c825f46cdfb34ffc090de.tar.bz2
Musicplayer application can not display DRM files of internal storage.
Make DRM-protected files transferred over MTP be detected. Previously it was inserted into the database as MEDIA_TYPE_NONE, the result of this was that the file was not detected properly. With this fix the file is scanned from the beginning. Change-Id: Idf17d39e3d529394cd4a03d71fb250e69b395533
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaScanner.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 6f8b809..fd37bcf 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1399,7 +1399,8 @@ public class MediaScanner
long lastModifiedSeconds = file.lastModified() / 1000;
if (!MediaFile.isAudioFileType(fileType) && !MediaFile.isVideoFileType(fileType) &&
- !MediaFile.isImageFileType(fileType) && !MediaFile.isPlayListFileType(fileType)) {
+ !MediaFile.isImageFileType(fileType) && !MediaFile.isPlayListFileType(fileType) &&
+ !MediaFile.isDrmFileType(fileType)) {
// no need to use the media scanner, but we need to update last modified and file size
ContentValues values = new ContentValues();