summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-03-23 17:32:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-23 17:32:43 -0700
commit2d09b855d5c0749ab845d3f2775125fea294f07c (patch)
tree644cc262411f46e3d3724112143e3bd4493978cd
parent0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4 (diff)
parent1e26d82ffaf983dc288152cfe8c0a821de33f2a4 (diff)
downloadframeworks_base-2d09b855d5c0749ab845d3f2775125fea294f07c.zip
frameworks_base-2d09b855d5c0749ab845d3f2775125fea294f07c.tar.gz
frameworks_base-2d09b855d5c0749ab845d3f2775125fea294f07c.tar.bz2
Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
-rw-r--r--core/java/android/webkit/HTML5VideoViewProxy.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java
index 094566f..acd7eab 100644
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -109,7 +109,7 @@ class HTML5VideoViewProxy extends Handler
boolean foundInTree = nativeSendSurfaceTexture(surfTexture,
layer, currentVideoLayerId, textureName,
playerState);
- if (playerState == HTML5VideoView.STATE_PREPARED
+ if (playerState >= HTML5VideoView.STATE_PREPARED
&& !foundInTree) {
mHTML5VideoView.pauseAndDispatch(mCurrentProxy);
mHTML5VideoView.deleteSurfaceTexture();