Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7ef6834e: Merge "DO NOT MERGE" into gingerbread

Browse Source 
Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp

* commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7':
  DO NOT MERGE
This commit is contained in:
Shimeng (Simon) Wang
2010-10-15 18:25:25 -07:00
committed by Android Git Automerger
parent fb47487259 7ef6834eea
commit 53820a9694
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/WebViewCore.java
View File

@@ -28,6 +28,7 @@ import android.graphics.Picture;
import android.graphics.Point; import android.graphics.Point;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.Region; import android.graphics.Region;
import android.media.MediaFile;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
@@ -255,6 +256,13 @@ final class WebViewCore {
return mSettings; return mSettings;
} }
/*
* Given mimeType, check whether it's supported in Android media framework.
* mimeType could be such as "audio/ogg" and "video/mp4".
*/
/* package */ static boolean supportsMimeType(String mimeType) {
return MediaFile.getFileTypeForMimeType(mimeType) > 0;
}
/** /**
* Add an error message to the client's console. * Add an error message to the client's console.
* @param message The message to add * @param message The message to add