diff options
| author | Tobias Thierer <tobiast@google.com> | 2019-09-30 03:02:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-30 03:02:29 -0700 |
| commit | dd268bd09d6b7451fca696f8a57cf5df21182579 (patch) | |
| tree | 263cd035044ab3df7f15b350ba2ee88567a35f41 /core/java | |
| parent | 40f943cb7ba83a808c8aa889cb7cad91fe8a3bfe (diff) | |
| parent | 4b461c15883435578532e0a9ea0eb5856677acc7 (diff) | |
Merge changes from topics "bug136256059_attempt2", "bug136256059_builder" am: 6ed8fce33f am: ffd40f7bd4
am: 4b461c1588
Change-Id: Ie3442bd7a8b27b9d446137079bbacb125dff753d
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/com/android/internal/os/RuntimeInit.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 89b0250c505b..9fff447c2478 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -20,7 +20,7 @@ import android.annotation.UnsupportedAppUsage; import android.app.ActivityManager; import android.app.ActivityThread; import android.app.ApplicationErrorReport; -import android.content.type.MimeMapImpl; +import android.content.type.DefaultMimeMapFactory; import android.os.Build; import android.os.DeadObjectException; import android.os.Debug; @@ -209,7 +209,7 @@ public class RuntimeInit { * contains many more entries that are derived from IANA registrations but * with several customizations (extensions, overrides). */ - MimeMap.setDefault(MimeMapImpl.createDefaultInstance()); + MimeMap.setDefault(DefaultMimeMapFactory.create()); } @UnsupportedAppUsage |