summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tobias Thierer <tobiast@google.com> 2019-08-29 04:01:36 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-29 04:01:36 -0700
commit1080bcbc06d62f6f0864f4eca231d0c54d3373fa (patch)
treef0b6b2f32aafbfedf947562b0d8244521945fd18
parent2b85f99dcd433b503c5138ad8f1a1c9673595fa3 (diff)
parent1b41ce4701763fad136e739686bbe84dfcbaf63f (diff)
Revert "Tweak RuntimeInit docs around MimeMap registration." am: 89bcfa5a21 am: f4cbf933b7 am: aa9b7696d1
am: 1b41ce4701 Change-Id: I9eda7d07d5b51aefcff9f6ce798214993cac5976
-rw-r--r--core/java/com/android/internal/os/RuntimeInit.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index 5b129f4c6e52..918d577b8fdc 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -214,10 +214,7 @@ public class RuntimeInit {
RuntimeHooks.setTimeZoneIdSupplier(() -> SystemProperties.get("persist.sys.timezone"));
/*
- * 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).
+ * Set a default mapping between MIME types and file extensions.
*/
MimeMap.setDefault(MimeMapImpl.createDefaultInstance());