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

2010-04-08 09:07:32 -07:00
parent c6c8a1e96f 31d2aa1e17
commit 3fe36fe589
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -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) {