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

Commit 0644dac1 authored by Shareef Ali's avatar Shareef Ali
Browse files

base: fix constant conflict 

There is a conflict 2 media type which shares the same constants which is a DVIX and JPEG.
which causes some app to think jpeg is a dvix video file
It was due to the merge of the qualcomm patches (patch: http://review.cyanogenmod.org/#/c/28960/ ) which was merged on the 23rd

Change-Id: Ida014adab4a954aa81a16d1ff401f9847f87d1a5
parent 36f9f64f

media/java/android/media/MediaFile.java

+9 −9
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ public class MediaFile { 
    private static final int LAST_AUDIO_FILE_TYPE2 = FILE_TYPE_DTS;



    // MIDI file types

    public static final int FILE_TYPE_MID     = 16;

    public static final int FILE_TYPE_SMF     = 17;

    public static final int FILE_TYPE_IMY     = 18;

    public static final int FILE_TYPE_MID     = 17;

    public static final int FILE_TYPE_SMF     = 18;

    public static final int FILE_TYPE_IMY     = 19;

    private static final int FIRST_MIDI_FILE_TYPE = FILE_TYPE_MID;

    private static final int LAST_MIDI_FILE_TYPE = FILE_TYPE_IMY;
@@ -90,12 +90,12 @@ public class MediaFile { 
    private static final int LAST_VIDEO_FILE_TYPE2 = FILE_TYPE_MP2PS;



    // Image file types

    public static final int FILE_TYPE_JPEG    = 31;

    public static final int FILE_TYPE_GIF     = 32;

    public static final int FILE_TYPE_PNG     = 33;

    public static final int FILE_TYPE_BMP     = 34;

    public static final int FILE_TYPE_WBMP    = 35;

    public static final int FILE_TYPE_WEBP    = 36;

    public static final int FILE_TYPE_JPEG    = 32;

    public static final int FILE_TYPE_GIF     = 33;

    public static final int FILE_TYPE_PNG     = 34;

    public static final int FILE_TYPE_BMP     = 35;

    public static final int FILE_TYPE_WBMP    = 36;

    public static final int FILE_TYPE_WEBP    = 37;

    private static final int FIRST_IMAGE_FILE_TYPE = FILE_TYPE_JPEG;

    private static final int LAST_IMAGE_FILE_TYPE = FILE_TYPE_WEBP;