diff options
| author | Shareef Ali <shareefalis@cyanogenmod.org> | 2012-12-25 19:28:23 -0600 |
|---|---|---|
| committer | Shareef Ali <shareefalis@cyanogenmod.org> | 2012-12-25 20:01:21 -0600 |
| commit | 0644dac1604bd2cf14224b87f25d4149f1919528 (patch) | |
| tree | 7d76f3063cdbf884a0573b12a831d6942ddc3115 /media | |
| parent | 36f9f64f375b4b96033210c33604161b09900e14 (diff) | |
| download | frameworks_base-0644dac1604bd2cf14224b87f25d4149f1919528.zip frameworks_base-0644dac1604bd2cf14224b87f25d4149f1919528.tar.gz frameworks_base-0644dac1604bd2cf14224b87f25d4149f1919528.tar.bz2 | |
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
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 5777729..95c9ad4 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -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; |