Merge "Tweak RuntimeInit docs around MimeMap registration." am: bc6371727c am: 41438c3730

am: b0c5a7af5a

Change-Id: Iaa0664ec6cf5f5f993d6cc5719120d7a9461037b

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index 918d577b8fdc..5b129f4c6e52 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -214,7 +214,10 @@ public class RuntimeInit {
         RuntimeHooks.setTimeZoneIdSupplier(() -> SystemProperties.get("persist.sys.timezone"));
 
         /*
-         * Set a default mapping between MIME types and file extensions.
+         * Replace libcore's minimal default mapping between MIME types and file
+         * extensions with a mapping that's suitable for Android. Android's mapping
+         * contains many more entries that are derived from IANA registrations but
+         * with several customizations (extensions, overrides).
          */
         MimeMap.setDefault(MimeMapImpl.createDefaultInstance());