Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '1531d211249783bdfc3ded9323397f22a5f1fc34' into kraken

* commit '1531d211249783bdfc3ded9323397f22a5f1fc34':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
This commit is contained in:
Andrei Popescu
2010-04-08 09:12:43 -07:00
committed by Android Git Automerger
parent c63c6e97c4 1531d21124
commit ec472da766
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/webkit/HTML5VideoViewProxy.java
View File

@@ -129,9 +129,10 @@ class HTML5VideoViewProxy extends Handler
// is invoked.
mTimer.cancel();
mTimer = null;
mCurrentProxy.playbackEnded();
if (mVideoView.isPlaying()) {
mVideoView.stopPlayback();
}
mCurrentProxy = null;
mVideoView.stopPlayback();
mLayout.removeView(mVideoView);
mVideoView = null;
if (mProgressView != null) {