Permalink
Browse files

framework\base: Fix the JPEG file indexing

- QC proprietary video format had index same as JPEG, so
  JPEG file is recognized as video clip in gallery.

Change-Id: Ic26b50cd531680e0e9277f2e1029f0965248d674
CRs-Fixed: 430954

Signed-off-by: bmc08gt <bmc08gt.teamb00sted@gmail.com>

- Also fix EC3 and MID having same int

Change-Id: Ic26b50cd531680e0e9277f2e1029f0965248d674
  • Loading branch information...
1 parent 1ee8432 commit 5a0803a6ed2edeadd8834b16bcc92da12f4773d8 vivek mehta committed with Gerrit Code Review Dec 20, 2012
Showing with 9 additions and 9 deletions.
  1. +9 −9 media/java/android/media/MediaFile.java
View
18 media/java/android/media/MediaFile.java
@@ -63,9 +63,9 @@
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 @@
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;

0 comments on commit 5a0803a

Please sign in to comment.