diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-06 09:12:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 09:12:17 -0700 |
| commit | 4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858 (patch) | |
| tree | 57fc83ac41e1105a88b097b95d1a7289f64a700b /media/java | |
| parent | 540995555505486074e9652a9c682bdf6e3056c5 (diff) | |
| parent | bb60bc26020f3aabc50aa93ad9bf812af7f48f9c (diff) | |
| download | frameworks_base-4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858.zip frameworks_base-4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858.tar.gz frameworks_base-4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858.tar.bz2 | |
am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."
* commit 'bb60bc26020f3aabc50aa93ad9bf812af7f48f9c':
Musicplayer application can not display DRM files of internal storage.
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 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(); |