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

Commit 7ce7b006 authored by ztenghui's avatar ztenghui Committed by Android (Google) Code Review
Browse files

Merge "HTML5Audio should handle content URI" into jb-mr2-dev

parents dcaa9436 4233ec72

core/java/android/webkit/HTML5Audio.java

+8 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.webkit; 
import android.content.Context;

import android.media.AudioManager;

import android.media.MediaPlayer;

import android.net.Uri;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -84,6 +85,7 @@ class HTML5Audio extends Handler 
    // See http://www.whatwg.org/specs/web-apps/current-work/#event-media-timeupdate

    private Timer mTimer;

    private final class TimeupdateTask extends TimerTask {

        @Override

        public void run() {

            HTML5Audio.this.obtainMessage(TIMEUPDATE).sendToTarget();

        }
@@ -139,11 +141,13 @@ class HTML5Audio extends Handler 
    // (i.e. the webviewcore thread here)



    // MediaPlayer.OnBufferingUpdateListener

    @Override

    public void onBufferingUpdate(MediaPlayer mp, int percent) {

        nativeOnBuffering(percent, mNativePointer);

    }



    // MediaPlayer.OnCompletionListener;

    @Override

    public void onCompletion(MediaPlayer mp) {

        mState = COMPLETE;

        mProcessingOnEnd = true;
@@ -156,6 +160,7 @@ class HTML5Audio extends Handler 
    }



    // MediaPlayer.OnErrorListener

    @Override

    public boolean onError(MediaPlayer mp, int what, int extra) {

        mState = ERROR;

        resetMediaPlayer();
@@ -164,6 +169,7 @@ class HTML5Audio extends Handler 
    }



    // MediaPlayer.OnPreparedListener

    @Override

    public void onPrepared(MediaPlayer mp) {

        mState = PREPARED;

        if (mTimer != null) {
@@ -178,6 +184,7 @@ class HTML5Audio extends Handler 
    }



    // MediaPlayer.OnSeekCompleteListener

    @Override

    public void onSeekComplete(MediaPlayer mp) {

        nativeOnTimeupdate(mp.getCurrentPosition(), mNativePointer);

    }
@@ -231,7 +238,7 @@ class HTML5Audio extends Handler 
                headers.put(HIDE_URL_LOGS, "true");

            }



            mMediaPlayer.setDataSource(url, headers);

            mMediaPlayer.setDataSource(mContext, Uri.parse(url), headers);

            mState = INITIALIZED;

            mMediaPlayer.prepareAsync();

        } catch (IOException e) {