diff options
| author | Mike Lockwood <lockwood@google.com> | 2012-09-18 10:53:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-18 10:53:11 -0700 |
| commit | 945080b5b61e28bfc05c75ba5b2030d1e43d0f19 (patch) | |
| tree | c6ec6628c75393ca3b4074fd4d05643ef1ce0146 | |
| parent | 5de9603529ee01a416b5fa31074197565fde4482 (diff) | |
| parent | 1e86994cd0e13f9084d3f4bd0060b9e34c935490 (diff) | |
| download | base-945080b5b61e28bfc05c75ba5b2030d1e43d0f19.tar.gz | |
am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
MtpData bmp format file can't recognize when copy bmp into DUT
| -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 7532d79233b7..a0325dd0c5fd 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, |