diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-09-18 10:25:41 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-18 10:25:42 -0700 |
| commit | 1e86994cd0e13f9084d3f4bd0060b9e34c935490 (patch) | |
| tree | d1189146d5d3a471884919ec37376a5551da2c07 /media | |
| parent | 31820a35b2cf864a8dcb71d43e6fd21d54f49a2d (diff) | |
| parent | 240582eabee56d55751b85e220811d48fabe839a (diff) | |
| download | frameworks_base-1e86994cd0e13f9084d3f4bd0060b9e34c935490.zip frameworks_base-1e86994cd0e13f9084d3f4bd0060b9e34c935490.tar.gz frameworks_base-1e86994cd0e13f9084d3f4bd0060b9e34c935490.tar.bz2 | |
Merge "MtpData bmp format file can't recognize when copy bmp into DUT"
Diffstat (limited to 'media')
| -rwxr-xr-x | media/java/android/mtp/MtpDatabase.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java index 7532d79..a0325dd 100755 --- a/media/java/android/mtp/MtpDatabase.java +++ b/media/java/android/mtp/MtpDatabase.java @@ -492,6 +492,7 @@ public class MtpDatabase { MtpConstants.FORMAT_MPEG, MtpConstants.FORMAT_EXIF_JPEG, MtpConstants.FORMAT_TIFF_EP, + MtpConstants.FORMAT_BMP, MtpConstants.FORMAT_GIF, MtpConstants.FORMAT_JFIF, MtpConstants.FORMAT_PNG, |