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

Commit 1201221d authored by wjiang's avatar wjiang Committed by Steve Kondik
Browse files

audio: correct mimetype id of certain audio types 

Extra audio type (DTS, 3GPA, AC3, QCP, PCM, EC3) isn't defined with
unique id which has already been occupied by other mimetype. Correct the
corresponding id range to avoid file type mistaken.

Change-Id: I9e69d98f2443c786b4d9ddfd476c656b91a860cb
CRs-Fixed: 735772
parent 8599e073

media/java/android/media/MediaFile.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -47,12 +47,12 @@ public class MediaFile { 
    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_FLAC;

    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_FLAC;





    // More audio file types

    // More audio file types

    public static final int FILE_TYPE_DTS   = 100;

    public static final int FILE_TYPE_DTS   = 300;

    public static final int FILE_TYPE_3GPA  = 101;

    public static final int FILE_TYPE_3GPA  = 301;

    public static final int FILE_TYPE_AC3   = 102;

    public static final int FILE_TYPE_AC3   = 302;

    public static final int FILE_TYPE_QCP   = 103;

    public static final int FILE_TYPE_QCP   = 303;

    public static final int FILE_TYPE_PCM   = 104;

    public static final int FILE_TYPE_PCM   = 304;

    public static final int FILE_TYPE_EC3   = 105;

    public static final int FILE_TYPE_EC3   = 305;

    private static final int FIRST_AUDIO_FILE_TYPE_EXT = FILE_TYPE_DTS;

    private static final int FIRST_AUDIO_FILE_TYPE_EXT = FILE_TYPE_DTS;

    private static final int LAST_AUDIO_FILE_TYPE_EXT = FILE_TYPE_EC3;

    private static final int LAST_AUDIO_FILE_TYPE_EXT = FILE_TYPE_EC3;