Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the issue the video can't start to play" into honeycomb-mr1

Browse Source
This commit is contained in:
Teng-Hui Zhu
2011-04-07 08:52:45 -07:00
committed by Android (Google) Code Review
parent b17cc8a83f 0504967cb0
commit b25181aacc
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/webkit/HTML5VideoFullScreen.java
View File

@@ -114,13 +114,6 @@ public class HTML5VideoFullScreen extends HTML5VideoView
return mVideoSurfaceView; return mVideoSurfaceView;
} }
@Override
public void start() {
if (getAutostart()) {
super.start();
}
}
HTML5VideoFullScreen(Context context, int videoLayerId, int position, HTML5VideoFullScreen(Context context, int videoLayerId, int position,
boolean autoStart) { boolean autoStart) {
mVideoSurfaceView = new VideoSurfaceView(context); mVideoSurfaceView = new VideoSurfaceView(context);

5
core/java/android/webkit/HTML5VideoViewProxy.java
View File

@@ -224,8 +224,9 @@ class HTML5VideoViewProxy extends Handler
} }
public static void onPrepared() { public static void onPrepared() {
// The VideoView will decide whether to really kick off to play. if (!mHTML5VideoView.isFullScreenMode() || mHTML5VideoView.getAutostart()) {
mHTML5VideoView.start(); mHTML5VideoView.start();
}
if (mBaseLayer != 0) { if (mBaseLayer != 0) {
setBaseLayer(mBaseLayer); setBaseLayer(mBaseLayer);
} }