diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-06 07:20:59 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-06 07:21:00 -0700 |
| commit | bb60bc26020f3aabc50aa93ad9bf812af7f48f9c (patch) | |
| tree | 0106561f1dd2825007de4d40623864c2e91eee35 /media | |
| parent | 380a8e3d126374b0205e8452bf2b4b70779e2606 (diff) | |
| parent | 20c38ea9fd4024cc076c825f46cdfb34ffc090de (diff) | |
| download | frameworks_base-bb60bc26020f3aabc50aa93ad9bf812af7f48f9c.zip frameworks_base-bb60bc26020f3aabc50aa93ad9bf812af7f48f9c.tar.gz frameworks_base-bb60bc26020f3aabc50aa93ad9bf812af7f48f9c.tar.bz2 | |
Merge "Musicplayer application can not display DRM files of internal storage."
Diffstat (limited to 'media')
| -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(); |