Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf56d87d authored by Tobias Thierer's avatar Tobias Thierer
Browse files

Inline calls to MimeUtils. 

A separate CL in this topic adds MimeMap to the @CorePlatformApi and
deletes MimeUtils. This CL inlines calls to MimeUtils to call MimeMap
instead.

Internally, FileTypeMap was refactored in such a way that this change
is not necessary on branches that have the internal change; therefore,
this CL carries a Merged-In line to skip merging into such branches.

Bug: 120171727
Test: Treehugger

Change-Id: If698d9afad4813ec1c21d511971216a95de9cba3
Merged-In: If62ee1a628feb909cd7b30ecf6e61f6845112d82
parent 611383c5

src/com/android/documentsui/FileTypeMap.java

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import android.util.SparseArray; 
import com.android.documentsui.base.Lookup;

import com.android.documentsui.base.MimeTypes;



import libcore.net.MimeUtils;

import libcore.net.MimeMap;



import java.util.HashMap;
@@ -152,7 +152,7 @@ public class FileTypeMap implements Lookup<String, String> { 


    private String getFileTypeString(

            String mimeType, @StringRes int formatStringId, @StringRes int defaultStringId) {

        final String extension = MimeUtils.guessExtensionFromMimeType(mimeType);

        final String extension = MimeMap.getDefault().guessExtensionFromMimeType(mimeType);



        return TextUtils.isEmpty(extension)

                ? mRes.getString(defaultStringId)