diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-09-18 11:01:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-18 11:01:32 -0700 |
| commit | 465d72073c6d47a27b51d384bd9e019faa7957c1 (patch) | |
| tree | 7e2ff63cd889968fe8e6f12858957c3b823f8e76 /media/java | |
| parent | c95b1d88477f5cd3abd6481e73a4185417e4a0bd (diff) | |
| parent | ad23333f728471a7f2c49cd1c9575f1cea2503f6 (diff) | |
| download | frameworks_base-465d72073c6d47a27b51d384bd9e019faa7957c1.zip frameworks_base-465d72073c6d47a27b51d384bd9e019faa7957c1.tar.gz frameworks_base-465d72073c6d47a27b51d384bd9e019faa7957c1.tar.bz2 | |
am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6':
MtpData bmp format file can't recognize when copy bmp into DUT
Diffstat (limited to 'media/java')
| -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 bd65b9e..487585e 100755 --- a/media/java/android/mtp/MtpDatabase.java +++ b/media/java/android/mtp/MtpDatabase.java @@ -490,6 +490,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, |