diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-04-07 09:14:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-07 09:14:50 -0700 |
| commit | d4e8e4bb3c2921ae9e15ef012bafc504b48c7efe (patch) | |
| tree | 09a128c8d5fcf2f015f952533e44b71091af1d57 /core/java/android/webkit/HTML5VideoViewProxy.java | |
| parent | 004da7e2e0287cdad63a9009841309d45f038787 (diff) | |
| parent | b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20 (diff) | |
am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
Fix the issue the video can't start to play
Diffstat (limited to 'core/java/android/webkit/HTML5VideoViewProxy.java')
| -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 acd7eab63a48..c7270299bec0 100644 --- a/core/java/android/webkit/HTML5VideoViewProxy.java +++ b/core/java/android/webkit/HTML5VideoViewProxy.java @@ -224,8 +224,9 @@ class HTML5VideoViewProxy extends Handler } public static void onPrepared() { - // The VideoView will decide whether to really kick off to play. - mHTML5VideoView.start(); + if (!mHTML5VideoView.isFullScreenMode() || mHTML5VideoView.getAutostart()) { + mHTML5VideoView.start(); + } if (mBaseLayer != 0) { setBaseLayer(mBaseLayer); } |