commit ece56fc6cefd8102a0718375e03831d52a24c4f6
author Tobias Thierer <tobiast@google.com> Fri Oct 04 12:54:17 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 04 12:54:17 2019 +0000
tree d08e6fd37daf42f07457ac1c1ec0d7e5768fcd18
parent f9fbb3964c8256162af48d62e82a6267291b1726
parent 75a5470393d3391c56b903cc77fa02e43a17d67e

Merge changes from topic "bug124232146_move_MimeMap"

* changes:
  Track MimeMap moving to libcore.content.type.
  Fix unused import.

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 9bc5c93..11005a4 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -145,7 +145,6 @@
 import com.android.providers.media.util.XmpInterface;
 
 import libcore.io.IoUtils;
-import libcore.net.MimeMap;
 import libcore.util.EmptyArray;
 
 import java.io.File;

src/com/android/providers/media/scan/LegacyMediaScanner.java

diff --git a/src/com/android/providers/media/scan/LegacyMediaScanner.java b/src/com/android/providers/media/scan/LegacyMediaScanner.java
index 26eca76..22c7bbc 100644
--- a/src/com/android/providers/media/scan/LegacyMediaScanner.java
+++ b/src/com/android/providers/media/scan/LegacyMediaScanner.java
@@ -20,8 +20,7 @@
 import android.net.Uri;
 import android.os.Trace;
 import android.provider.MediaStore;
-
-import libcore.net.MimeMap;
+import android.webkit.MimeTypeMap;
 
 import java.io.File;
 
@@ -61,7 +60,7 @@
                 new android.media.MediaScanner(mContext, volumeName)) {
             final String ext = path.substring(path.lastIndexOf('.') + 1);
             return scanner.scanSingleFile(path,
-                    MimeMap.getDefault().guessMimeTypeFromExtension(ext));
+                    MimeTypeMap.getSingleton().getMimeTypeFromExtension(ext));
         } finally {
             Trace.traceEnd(Trace.TRACE_TAG_DATABASE);
         }

src/com/android/providers/media/scan/ModernMediaScanner.java

diff --git a/src/com/android/providers/media/scan/ModernMediaScanner.java b/src/com/android/providers/media/scan/ModernMediaScanner.java
index dc29d77..1586969 100644
--- a/src/com/android/providers/media/scan/ModernMediaScanner.java
+++ b/src/com/android/providers/media/scan/ModernMediaScanner.java
@@ -81,8 +81,6 @@
 import com.android.providers.media.util.IsoInterface;
 import com.android.providers.media.util.XmpInterface;
 
-import libcore.net.MimeMap;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;