Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0faa5c6c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 27271 into eclair 

* changes:
  Only scan windows media files when those codecs are enabled.
parents 954e98e0 0ddbc35d

media/java/android/media/MediaFile.java

+8 −3
Original line number Diff line number Diff line
@@ -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");

        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");

        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");