summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/HTML5VideoViewProxy.java
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-03-19 13:56:49 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-03-19 14:16:03 -0700
commit2b64c5a6f70bfae7db95f763441b52a506d6f630 (patch)
tree2c56355284d6d50ad4821bcec7a4e7005c858f37 /core/java/android/webkit/HTML5VideoViewProxy.java
parentf6b8f7b34f5fe94cd1d8753ec356b967293f1f9c (diff)
Don't allow enter full screen while still in full screen mode.
bug:5504581 Change-Id: Ib4922ce2cdb89b24120f87177658ce94c483f118
Diffstat (limited to 'core/java/android/webkit/HTML5VideoViewProxy.java')
-rw-r--r--core/java/android/webkit/HTML5VideoViewProxy.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java
index 1644b0671ad2..40c377890015 100644
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -146,6 +146,12 @@ class HTML5VideoViewProxy extends Handler
// Save the inline video info and inherit it in the full screen
int savePosition = 0;
if (mHTML5VideoView != null) {
+ // We don't allow enter full screen mode while the previous
+ // full screen video hasn't finished yet.
+ if (!mHTML5VideoView.fullScreenExited() && mHTML5VideoView.isFullScreenMode()) {
+ Log.w(LOGTAG, "Try to reenter the full screen mode");
+ return;
+ }
// If we are playing the same video, then it is better to
// save the current position.
if (layerId == mHTML5VideoView.getVideoLayerId()) {