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

Commit ec472da7 authored by Andrei Popescu's avatar Andrei Popescu Committed by Android Git Automerger
Browse files

am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in... 

am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo

Merge commit '1531d211' into kraken

* commit '1531d211':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
parents c63c6e97 1531d211

core/java/android/webkit/HTML5VideoViewProxy.java

+3 −2
Original line number Diff line number Diff line
@@ -129,9 +129,10 @@ class HTML5VideoViewProxy extends Handler 
                    // is invoked.

                    mTimer.cancel();

                    mTimer = null;

                    mCurrentProxy.playbackEnded();

                    mCurrentProxy = null;

                    if (mVideoView.isPlaying()) {

                        mVideoView.stopPlayback();

                    }

                    mCurrentProxy = null;

                    mLayout.removeView(mVideoView);

                    mVideoView = null;

                    if (mProgressView != null) {