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

Commit 202a16ec authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "More robust MTP-to-MIME-type mappings."

parents 1545cd72 91e3cd4c

core/java/android/content/ContentResolver.java

+6 −0
Original line number Diff line number Diff line
@@ -437,6 +437,12 @@ public abstract class ContentResolver { 
     */

    public static final String ANY_CURSOR_ITEM_TYPE = "vnd.android.cursor.item/*";



    /**

     * Default MIME type for files whose type is otherwise unknown.

     * @hide

     */

    public static final String MIME_TYPE_DEFAULT = "application/octet-stream";



    /** @hide */

    @UnsupportedAppUsage

    public static final int SYNC_ERROR_SYNC_ALREADY_IN_PROGRESS = 1;

core/java/android/os/FileUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.system.OsConstants.S_ISREG; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.ContentResolver;

import android.provider.DocumentsContract.Document;

import android.system.ErrnoException;

import android.system.Os;
@@ -1057,7 +1058,7 @@ public class FileUtils { 
            }



            if (mimeTypeFromExt == null) {

                mimeTypeFromExt = "application/octet-stream";

                mimeTypeFromExt = ContentResolver.MIME_TYPE_DEFAULT;

            }



            final String extFromMimeType = MimeTypeMap.getSingleton().getExtensionFromMimeType(

core/java/com/android/internal/content/FileSystemProvider.java

+1 −5
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ public abstract class FileSystemProvider extends DocumentsProvider { 


    private Handler mHandler;



    private static final String MIMETYPE_JPEG = "image/jpeg";

    private static final String MIMETYPE_JPG = "image/jpg";

    private static final String MIMETYPE_OCTET_STREAM = "application/octet-stream";



    protected abstract File getFileForDocId(String docId, boolean visible)

            throws FileNotFoundException;
@@ -433,7 +429,7 @@ public abstract class FileSystemProvider extends DocumentsProvider { 
                    return mime;

                }

            }

            return MIMETYPE_OCTET_STREAM;

            return ContentResolver.MIME_TYPE_DEFAULT;

        }

    }