diff options
| author | Marco Nelissen <marcone@google.com> | 2009-09-27 11:24:41 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2009-09-27 11:25:49 -0700 |
| commit | 0ddbc35dc4974fbe18a4191e579b1eda5a7ef2b1 (patch) | |
| tree | b472f2093706d51c151b9c80d687f69353092a49 /media/java | |
| parent | a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169 (diff) | |
| download | frameworks_base-0ddbc35dc4974fbe18a4191e579b1eda5a7ef2b1.zip frameworks_base-0ddbc35dc4974fbe18a4191e579b1eda5a7ef2b1.tar.gz frameworks_base-0ddbc35dc4974fbe18a4191e579b1eda5a7ef2b1.tar.bz2 | |
Only scan windows media files when those codecs are enabled.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaFile.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 03ffc67..8180a7c 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -17,6 +17,7 @@ package android.media; import android.content.ContentValues; +import android.os.SystemProperties; import android.provider.MediaStore.Audio; import android.provider.MediaStore.Images; import android.provider.MediaStore.Video; @@ -103,7 +104,9 @@ public class MediaFile { addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav"); addFileType("AMR", FILE_TYPE_AMR, "audio/amr"); addFileType("AWB", FILE_TYPE_AWB, "audio/amr-wb"); - addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma"); + if (SystemProperties.getInt("ro.media.dec.aud.wma.enabled", 0) != 0) { + addFileType("WMA", FILE_TYPE_WMA, "audio/x-ms-wma"); + } addFileType("OGG", FILE_TYPE_OGG, "application/ogg"); addFileType("OGA", FILE_TYPE_OGG, "application/ogg"); addFileType("AAC", FILE_TYPE_AAC, "audio/aac"); @@ -123,8 +126,10 @@ public class MediaFile { addFileType("3GPP", FILE_TYPE_3GPP, "video/3gpp"); addFileType("3G2", FILE_TYPE_3GPP2, "video/3gpp2"); addFileType("3GPP2", FILE_TYPE_3GPP2, "video/3gpp2"); - addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv"); - addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf"); + if (SystemProperties.getInt("ro.media.dec.vid.wmv.enabled", 0) != 0) { + addFileType("WMV", FILE_TYPE_WMV, "video/x-ms-wmv"); + addFileType("ASF", FILE_TYPE_ASF, "video/x-ms-asf"); + } addFileType("JPG", FILE_TYPE_JPEG, "image/jpeg"); addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg"); |