am 4aa83ec: am bb60bc2: Merge "Musicplayer application can not display DRM files of internal storage."

* commit '4aa83ec3eee5c21e6a63c1981c219f3d3a5ac858':
  Musicplayer application can not display DRM files of internal storage.

Author: Jean-Baptiste Queru

media/java/android/media/MediaScanner.java

@@ -1399,7 +1399,8 @@ public void scanMtpFile(String path, String volumeName, int objectHandle, int fo
         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();