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

Commit 53820a96 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang Committed by Android Git Automerger
Browse files

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

Merge commit '7ef6834e' into gingerbread-plus-aosp

* commit '7ef6834e':
  DO NOT MERGE
parents fb474872 7ef6834e

core/java/android/webkit/WebViewCore.java

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.graphics.Picture; 
import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.Region;

import android.media.MediaFile;

import android.net.Uri;

import android.os.Handler;

import android.os.Looper;
@@ -255,6 +256,13 @@ final class WebViewCore { 
        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.

     * @param message The message to add