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

Commit f2c44a79 authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by Android Git Automerger
Browse files

am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 

* commit '039aa81a':
  Fix a crash
parents 112852b5 039aa81a

core/java/android/webkit/HTML5VideoFullScreen.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -209,9 +209,6 @@ public class HTML5VideoFullScreen extends HTML5VideoView 
                // which happens when the video view is detached from its parent

                // which happens when the video view is detached from its parent

                // view. This happens in the WebChromeClient before this method

                // view. This happens in the WebChromeClient before this method

                // is invoked.

                // is invoked.

                mTimer.cancel();

                mTimer = null;



                pauseAndDispatch(mProxy);

                pauseAndDispatch(mProxy);





                mLayout.removeView(getSurfaceView());

                mLayout.removeView(getSurfaceView());

core/java/android/webkit/HTML5VideoView.java

+15 −6
Original line number Original line Diff line number Diff line
@@ -68,6 +68,14 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{ 
    // common Video control FUNCTIONS:

    // common Video control FUNCTIONS:

    public void start() {

    public void start() {

        if (mCurrentState == STATE_PREPARED) {

        if (mCurrentState == STATE_PREPARED) {

            // When replaying the same video, there is no onPrepared call.

            // Therefore, the timer should be set up here.

            if (mTimer == null)

            {

                mTimer = new Timer();

                mTimer.schedule(new TimeupdateTask(mProxy), TIMEUPDATE_PERIOD,

                        TIMEUPDATE_PERIOD);

            }

            mPlayer.start();

            mPlayer.start();

        }

        }

    }

    }
@@ -76,8 +84,12 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{ 
        if (mCurrentState == STATE_PREPARED && mPlayer.isPlaying()) {

        if (mCurrentState == STATE_PREPARED && mPlayer.isPlaying()) {

            mPlayer.pause();

            mPlayer.pause();

        }

        }



        // Delete the Timer to stop it since there is no stop call.

        if (mTimer != null) {

        if (mTimer != null) {

            mTimer.purge();

            mTimer.purge();

            mTimer.cancel();

            mTimer = null;

        }

        }

    }

    }
@@ -129,6 +141,7 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{ 
        mVideoLayerId = videoLayerId;

        mVideoLayerId = videoLayerId;

        mSaveSeekTime = position;

        mSaveSeekTime = position;

        mAutostart = autoStart;

        mAutostart = autoStart;

        mTimer = null;

    }

    }





    protected HTML5VideoView() {

    protected HTML5VideoView() {
@@ -153,8 +166,6 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{ 
        // When switching players, surface texture will be reused.

        // When switching players, surface texture will be reused.

        mUri = uri;

        mUri = uri;

        mHeaders = generateHeaders(uri, proxy);

        mHeaders = generateHeaders(uri, proxy);



        mTimer = new Timer();

    }

    }





    // Listeners setup FUNCTIONS:

    // Listeners setup FUNCTIONS:
@@ -228,11 +239,9 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener{ 
    public void onPrepared(MediaPlayer mp) {

    public void onPrepared(MediaPlayer mp) {

        mCurrentState = STATE_PREPARED;

        mCurrentState = STATE_PREPARED;

        seekTo(mSaveSeekTime);

        seekTo(mSaveSeekTime);

        if (mProxy != null)

        if (mProxy != null) {

            mProxy.onPrepared(mp);

            mProxy.onPrepared(mp);



        }

        mTimer.schedule(new TimeupdateTask(mProxy), TIMEUPDATE_PERIOD, TIMEUPDATE_PERIOD);



    }

    }





    // Pause the play and update the play/pause button

    // Pause the play and update the play/pause button