diff options
| author | Tobias Thierer <tobiast@google.com> | 2019-10-04 06:20:07 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-04 06:20:07 -0700 |
| commit | b43f746cdc22e9899ae30be6b6abb246f3d4eec8 (patch) | |
| tree | b2be6cc1d77f9c02c13942d9c452183818271331 /core/java | |
| parent | 6d6dc567d7d0d0c92929cc320bd6c4a367c06849 (diff) | |
| parent | 093c1e4eaa85ef69984429dea08bcb1e7d58a5b6 (diff) | |
Merge "Track MimeMap moving to libcore.content.type." am: 0801b7c222
am: 093c1e4eaa
Change-Id: If2b46820dc9ba3d8ba6b8f542521f3818b0074c9
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/MimeTypeMap.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/RuntimeInit.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/util/MimeIconUtils.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java index fc23c54e834e..358fdc78c0a0 100644 --- a/core/java/android/webkit/MimeTypeMap.java +++ b/core/java/android/webkit/MimeTypeMap.java @@ -19,7 +19,7 @@ package android.webkit; import android.annotation.Nullable; import android.text.TextUtils; -import libcore.net.MimeMap; +import libcore.content.type.MimeMap; import java.util.regex.Pattern; diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index 9fff447c2478..103c79d22530 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -35,7 +35,7 @@ import com.android.server.NetworkManagementSocketTagger; import dalvik.system.RuntimeHooks; import dalvik.system.VMRuntime; -import libcore.net.MimeMap; +import libcore.content.type.MimeMap; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/core/java/com/android/internal/util/MimeIconUtils.java b/core/java/com/android/internal/util/MimeIconUtils.java index 2230c3134301..31ea5b2bf07c 100644 --- a/core/java/com/android/internal/util/MimeIconUtils.java +++ b/core/java/com/android/internal/util/MimeIconUtils.java @@ -27,7 +27,7 @@ import android.util.ArrayMap; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; -import libcore.net.MimeMap; +import libcore.content.type.MimeMap; import java.util.Locale; import java.util.Objects; |