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

Commit c5fad30d authored by Steve Kondik's avatar Steve Kondik Committed by Ricardo Cerqueira
Browse files

Revert "frameworks/base: media: add support for DIVX files" 

This reverts commit 1cf37fe9.

Change-Id: I32d7378f469166bc63b3aaa5a1e3e31ae1ec812a
parent fc063453

media/java/android/media/MediaFile.java

+1 −3
Original line number Diff line number Diff line
@@ -74,9 +74,8 @@ public class MediaFile { 
    

    // More video file types

    public static final int FILE_TYPE_MP2PS   = 200;

    public static final int FILE_TYPE_DIVX    = 201;

    private static final int FIRST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;

    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_DIVX;

    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;



    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;
@@ -246,7 +245,6 @@ public class MediaFile { 
        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");

        addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("MPEG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("DIVX", FILE_TYPE_DIVX, "video/divx");

    }



    public static boolean isAudioFileType(int fileType) {