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

Commit 0c7d077e authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge changes I68379740,I9053218f 

* changes:
  MediaFile: Add support for some popular non-media file types.
  Media scanner support for tracking files of arbitrary type.
parents cec7eb1c fde2ca18

core/java/android/provider/MediaStore.java

+12 −0
Original line number Diff line number Diff line
@@ -339,6 +339,18 @@ public final class MediaStore { 
             */

            public static final String MEDIA_ID = "media_id";

        }



        /**

         * The MIME type of the file

         * <P>Type: TEXT</P>

         */

        public static final String MIME_TYPE = "mime_type";



        /**

         * The title of the content

         * <P>Type: TEXT</P>

         */

        public static final String TITLE = "title";

    }



    /**

include/media/mediascanner.h

+3 −5
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ struct MediaScanner { 


    typedef bool (*ExceptionCheck)(void* env);

    virtual status_t processDirectory(

            const char *path, const char *extensions,

            MediaScannerClient &client,

            const char *path, MediaScannerClient &client,

            ExceptionCheck exceptionCheck, void *exceptionEnv);



    void setLocale(const char *locale);
@@ -55,9 +54,8 @@ private: 
    char *mLocale;



    status_t doProcessDirectory(

            char *path, int pathRemaining, const char *extensions,

            MediaScannerClient &client, ExceptionCheck exceptionCheck,

            void *exceptionEnv);

            char *path, int pathRemaining, MediaScannerClient &client,

            ExceptionCheck exceptionCheck, void *exceptionEnv);



    MediaScanner(const MediaScanner &);

    MediaScanner &operator=(const MediaScanner &);

media/java/android/media/MediaFile.java

+51 −33
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import java.util.List; 
 * {@hide}

 */

public class MediaFile {

    // comma separated list of all file extensions supported by the media scanner

    public final static String sFileExtensions;



    // Audio file types

    public static final int FILE_TYPE_MP3     = 1;
@@ -85,6 +83,17 @@ public class MediaFile { 
    private static final int FIRST_PLAYLIST_FILE_TYPE = FILE_TYPE_M3U;

    private static final int LAST_PLAYLIST_FILE_TYPE = FILE_TYPE_WPL;



    // Other popular file types

    public static final int FILE_TYPE_TEXT          = 100;

    public static final int FILE_TYPE_HTML          = 101;

    public static final int FILE_TYPE_PDF           = 102;

    public static final int FILE_TYPE_XML           = 103;

    public static final int FILE_TYPE_MS_WORD       = 104;

    public static final int FILE_TYPE_MS_EXCEL      = 105;

    public static final int FILE_TYPE_MS_POWERPOINT = 106;

    public static final int FILE_TYPE_FLAC          = 107;

    public static final int FILE_TYPE_ZIP           = 108;

    

    static class MediaFileType {

    

        int fileType;
@@ -132,16 +141,6 @@ public class MediaFile { 
        return false;

    }



    private static boolean isWMVEnabled() {

        List<VideoDecoder> decoders = DecoderCapabilities.getVideoDecoders();

        for (VideoDecoder decoder: decoders) {

            if (decoder == VideoDecoder.VIDEO_DECODER_WMV) {

                return true;

            }

        }

        return false;

    }



    static {

        addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3);

        addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG);
@@ -176,10 +175,8 @@ public class MediaFile { 
        addFileType("WEBM", FILE_TYPE_MKV, "video/x-matroska");

        addFileType("TS", FILE_TYPE_MP2TS, "video/mp2ts");



        if (isWMVEnabled()) {

        addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv", MtpConstants.FORMAT_WMV);

        addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf");

        }



        addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);

        addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);
@@ -192,17 +189,15 @@ public class MediaFile { 
        addFileType("PLS", FILE_TYPE_PLS, "audio/x-scpls", MtpConstants.FORMAT_PLS_PLAYLIST);

        addFileType("WPL", FILE_TYPE_WPL, "application/vnd.ms-wpl", MtpConstants.FORMAT_WPL_PLAYLIST);



        // compute file extensions list for native Media Scanner

        StringBuilder builder = new StringBuilder();

        Iterator<String> iterator = sFileTypeMap.keySet().iterator();

        

        while (iterator.hasNext()) {

            if (builder.length() > 0) {

                builder.append(',');

            }

            builder.append(iterator.next());

        } 

        sFileExtensions = builder.toString();

        addFileType("TXT", FILE_TYPE_TEXT, "text/plain", MtpConstants.FORMAT_TEXT);

        addFileType("HTM", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML);

        addFileType("HTML", FILE_TYPE_HTML, "text/html", MtpConstants.FORMAT_HTML);

        addFileType("PDF", FILE_TYPE_PDF, "application/pdf");

        addFileType("DOC", FILE_TYPE_MS_WORD, "application/msword", MtpConstants.FORMAT_MS_WORD_DOCUMENT);

        addFileType("XLS", FILE_TYPE_MS_EXCEL, "application/vnd.ms-excel", MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET);

        addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/mspowerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION);

        addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC);

        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");

    }



    public static boolean isAudioFileType(int fileType) {
@@ -234,11 +229,34 @@ public class MediaFile { 
        return sFileTypeMap.get(path.substring(lastDot + 1).toUpperCase());

    }



    // generates a title based on file name

    public static String getFileTitle(String path) {

        // extract file name after last slash

        int lastSlash = path.lastIndexOf('/');

        if (lastSlash >= 0) {

            lastSlash++;

            if (lastSlash < path.length()) {

                path = path.substring(lastSlash);

            }

        }

        // truncate the file extension (if any)

        int lastDot = path.lastIndexOf('.');

        if (lastDot > 0) {

            path = path.substring(0, lastDot);

        }

        return path;

    }



    public static int getFileTypeForMimeType(String mimeType) {

        Integer value = sMimeTypeMap.get(mimeType);

        return (value == null ? 0 : value.intValue());

    }



    public static String getMimeTypeForFile(String path) {

        MediaFileType mediaFileType = getFileType(path);

        return (mediaFileType == null ? null : mediaFileType.mimeType);

    }



    public static int getFormatCode(String fileName, String mimeType) {

        if (mimeType != null) {

            Integer value = sMimeTypeToFormatMap.get(mimeType);

media/java/android/media/MediaScanner.java

+191 −171

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/MtpDatabase.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class MtpDatabase { 
                    Log.e(TAG, "RemoteException in endSendObject", e);

                }

            } else {

                Uri uri = mMediaScanner.scanMtpFile(path, mVolumeName, handle, format);

                mMediaScanner.scanMtpFile(path, mVolumeName, handle, format);

            }

        } else {

            deleteFile(handle);