commit e1466464aee9110b2d852c82dd04ed9aa9ed9aa5
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 28 15:35:07 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 28 15:35:07 2020 +0000
tree 85b277a75b9e7e188265b33fcc7881c30bd37230
parent aeabb60d469ae8f60ca330c8f5fcc01e64b8aa37
parent 663f1448c32f6e586813730d00cd0174998b8052

Merge "Allow ModernMediaScanner to set MEDIA_TYPE" into rvc-dev

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 0920b47..762dbf4 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -2703,7 +2703,12 @@
 
         if (mimeType != null) {
             values.put(FileColumns.MIME_TYPE, mimeType);
-            values.put(FileColumns.MEDIA_TYPE, MimeUtils.resolveMediaType(mimeType));
+            if (isCallingPackageSystem() && values.containsKey(FileColumns.MEDIA_TYPE)) {
+                // Leave FileColumns.MEDIA_TYPE untouched if the caller is ModernMediaScanner and
+                // FileColumns.MEDIA_TYPE is already populated.
+            } else{
+                values.put(FileColumns.MEDIA_TYPE, MimeUtils.resolveMediaType(mimeType));
+            }
         } else {
             values.put(FileColumns.MEDIA_TYPE, mediaType);
         }