Merge "Don't send pause again when coming back from full screen"

2011-04-08 09:19:01 -07:00
parent 0d15042b39 22954d435d
commit cfa5ccfbc5
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -184,7 +184,9 @@ class HTML5VideoViewProxy extends Handler
                // we need to pause the old one and re-create a new media player
                // inside the HTML5VideoView.
                if (mHTML5VideoView != null) {
-                    mHTML5VideoView.pauseAndDispatch(mCurrentProxy);
+                    if (!backFromFullScreenMode) {
+                        mHTML5VideoView.pauseAndDispatch(mCurrentProxy);
+                    }
                    // release the media player to avoid finalize error
                    mHTML5VideoView.release();
                }