diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-04-07 09:24:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-07 09:24:02 -0700 |
| commit | c1b4d9691dad77586e9a38f857137bb6f010f254 (patch) | |
| tree | 913175f4b1139b6b4bb265b7c0d82385863a3680 /core/java/android/webkit/HTML5VideoViewProxy.java | |
| parent | fcdebf88a483faa2f9bbde2b9a4093ca98b2ba6c (diff) | |
| parent | d4e8e4bb3c2921ae9e15ef012bafc504b48c7efe (diff) | |
| download | frameworks_base-c1b4d9691dad77586e9a38f857137bb6f010f254.zip frameworks_base-c1b4d9691dad77586e9a38f857137bb6f010f254.tar.gz frameworks_base-c1b4d9691dad77586e9a38f857137bb6f010f254.tar.bz2 | |
am d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
* commit 'd4e8e4bb3c2921ae9e15ef012bafc504b48c7efe':
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 14157c2..060c0bb 100644 --- a/core/java/android/webkit/HTML5VideoViewProxy.java +++ b/core/java/android/webkit/HTML5VideoViewProxy.java @@ -232,8 +232,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); } |