commit eb2a053326bfcccde855cf37da667aa36c07e4c2
author Tobias Thierer <tobiast@google.com> Fri Aug 23 22:04:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 23 22:04:24 2019 -0700
tree 919af83d7c4a03086d27c9c96e78ec4efc8af558
parent edeb0313b716064163b06adaa7d7c02b3c97ead9
parent bc59f857aa955e680fca17869b87aa4c4b164805

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

Change-Id: I09976c187805459c01101e2c8dd1b056fc2067a5

core/java/com/android/internal/os/RuntimeInit.java

diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index 918d577..5b129f4 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -214,7 +214,10 @@
         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());