commit 304132e995c17a09ec57fda93ba9ecc7e9666cc1
author Tobias Thierer <tobiast@google.com> Thu May 02 13:41:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 02 13:41:44 2019 +0000
tree 09cc7fd0e438ade18d925f6441c3f93c46bbf540
parent 2bd4dd2339d3a2bccd32f3e234bbe82d0d021c23
parent bfa552c9189527e5c8912ab2527e319135c4c292

Merge "Inline calls to MimeUtils."

core/java/android/webkit/MimeTypeMap.java

diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java
index 3861695..fc23c54 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -19,7 +19,7 @@
 import android.annotation.Nullable;
 import android.text.TextUtils;
 
-import libcore.net.MimeUtils;
+import libcore.net.MimeMap;
 
 import java.util.regex.Pattern;
 
@@ -79,7 +79,7 @@
      * @return {@code true} if there is a mimeType entry in the map.
      */
     public boolean hasMimeType(String mimeType) {
-        return MimeUtils.hasMimeType(mimeType);
+        return MimeMap.getDefault().hasMimeType(mimeType);
     }
 
     /**
@@ -89,12 +89,12 @@
      */
     @Nullable
     public String getMimeTypeFromExtension(String extension) {
-        return MimeUtils.guessMimeTypeFromExtension(extension);
+        return MimeMap.getDefault().guessMimeTypeFromExtension(extension);
     }
 
     // Static method called by jni.
     private static String mimeTypeFromExtension(String extension) {
-        return MimeUtils.guessMimeTypeFromExtension(extension);
+        return MimeMap.getDefault().guessMimeTypeFromExtension(extension);
     }
 
     /**
@@ -103,7 +103,7 @@
      * @return {@code true} if there is an extension entry in the map.
      */
     public boolean hasExtension(String extension) {
-        return MimeUtils.hasExtension(extension);
+        return MimeMap.getDefault().hasExtension(extension);
     }
 
     /**
@@ -115,7 +115,7 @@
      */
     @Nullable
     public String getExtensionFromMimeType(String mimeType) {
-        return MimeUtils.guessExtensionFromMimeType(mimeType);
+        return MimeMap.getDefault().guessExtensionFromMimeType(mimeType);
     }
 
     /**