diff options
| author | Andrei Popescu <andreip@google.com> | 2010-04-08 09:07:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-08 09:07:32 -0700 |
| commit | 3fe36fe589809b732db12054428166adb069f53b (patch) | |
| tree | deaa18754fce3b731a34aa1588f92ceb6e338a98 | |
| parent | c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a (diff) | |
| parent | 31d2aa1e17f1ee580edb762a6ef634098bba02bb (diff) | |
| download | frameworks_base-3fe36fe589809b732db12054428166adb069f53b.zip frameworks_base-3fe36fe589809b732db12054428166adb069f53b.tar.gz frameworks_base-3fe36fe589809b732db12054428166adb069f53b.tar.bz2 | |
Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
| -rw-r--r-- | core/java/android/webkit/HTML5VideoViewProxy.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java index 42e1539..eee8025 100644 --- 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) { |