summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/HTML5VideoViewProxy.java
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-04-07 17:13:18 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2011-04-07 17:53:24 -0700
commit22954d435d645d48885f653bd4ca6bc79e1bcd83 (patch)
treef39f78b19052678224f68fe556a67690f64ff906 /core/java/android/webkit/HTML5VideoViewProxy.java
parent280dda75f3a974a7f519c8c99ea1c56100f01677 (diff)
Don't send pause again when coming back from full screen
When we enter full screen, the inline video has been paused. When we re-play in the inline mode, we don't need to paused the previous video, which is the full screen one. bug:4259109 Change-Id: Ib951846e6c22893713b00699263f7d038bcb7353
Diffstat (limited to 'core/java/android/webkit/HTML5VideoViewProxy.java')
-rw-r--r--core/java/android/webkit/HTML5VideoViewProxy.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java
index 060c0bbfdde9..d1b8cfc199a2 100644
--- 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();
}