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

Commit 02e27432 authored by Andrei Popescu's avatar Andrei Popescu Committed by Android (Google) Code Review
Browse files

Merge "VideoPlayer::onPrepared() can be called after the user pressed back in... 

Merge "VideoPlayer::onPrepared() can be called after the user pressed back in the VideoView. This can cass a NPE since our Timer would have been destroyed by then."
parents 7628fbe0 8aab46ab

core/java/android/webkit/HTML5VideoViewProxy.java

+2 −2
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ class HTML5VideoViewProxy extends Handler 
                    mTimer = null;

                    mCurrentProxy.playbackEnded();

                    mCurrentProxy = null;

                    mVideoView.stopPlayback();

                    mLayout.removeView(mVideoView);

                    mVideoView = null;

                    if (mProgressView != null) {
@@ -218,11 +219,10 @@ class HTML5VideoViewProxy extends Handler 
        }



        public static void onPrepared() {

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



            if (mProgressView == null || mLayout == null) {

                return;

            }

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

            mProgressView.setVisibility(View.GONE);

            mLayout.removeView(mProgressView);

            mProgressView = null;