diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-09-23 21:33:29 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-09-23 22:08:24 -0400 |
| commit | 12b8a99fc1d4acc427307a4a924bf33745410260 (patch) | |
| tree | c38f0fd01ce7e74197fe46e137137340d6dc6d59 /media/java | |
| parent | ba7655432c31c1a3ed48e768403d0b43ce9b2395 (diff) | |
| download | frameworks_base-12b8a99fc1d4acc427307a4a924bf33745410260.zip frameworks_base-12b8a99fc1d4acc427307a4a924bf33745410260.tar.gz frameworks_base-12b8a99fc1d4acc427307a4a924bf33745410260.tar.bz2 | |
MTP: List all the formats we support in addition to FORMAT_UNDEFINED
Fixes Windows Media Player support
BUG: 3003770
Change-Id: I75c4c7dcdd833b3b5b200339e24c38d583efb1fa
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MtpDatabase.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/media/java/android/media/MtpDatabase.java b/media/java/android/media/MtpDatabase.java index b64299a..aea3af5 100644 --- a/media/java/android/media/MtpDatabase.java +++ b/media/java/android/media/MtpDatabase.java @@ -246,8 +246,30 @@ public class MtpDatabase { return new int[] { // allow transfering arbitrary files MtpConstants.FORMAT_UNDEFINED, + MtpConstants.FORMAT_ASSOCIATION, + MtpConstants.FORMAT_TEXT, + MtpConstants.FORMAT_HTML, + MtpConstants.FORMAT_WAV, + MtpConstants.FORMAT_MP3, + MtpConstants.FORMAT_MPEG, + MtpConstants.FORMAT_EXIF_JPEG, + MtpConstants.FORMAT_TIFF_EP, + MtpConstants.FORMAT_GIF, + MtpConstants.FORMAT_JFIF, + MtpConstants.FORMAT_PNG, + MtpConstants.FORMAT_TIFF, + MtpConstants.FORMAT_WMA, + MtpConstants.FORMAT_OGG, + MtpConstants.FORMAT_AAC, + MtpConstants.FORMAT_MP4_CONTAINER, + MtpConstants.FORMAT_MP2, + MtpConstants.FORMAT_3GP_CONTAINER, MtpConstants.FORMAT_ABSTRACT_AV_PLAYLIST, + MtpConstants.FORMAT_WPL_PLAYLIST, + MtpConstants.FORMAT_M3U_PLAYLIST, + MtpConstants.FORMAT_PLS_PLAYLIST, + MtpConstants.FORMAT_XML_DOCUMENT, }; } |