Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4e8e4bb authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by Android Git Automerger
Browse files

am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1 

* commit 'b3bb6fd5':
  Fix the issue the video can't start to play
parents 004da7e2 b3bb6fd5

core/java/android/webkit/HTML5VideoFullScreen.java

+0 −7
Original line number Diff line number Diff line
@@ -114,13 +114,6 @@ public class HTML5VideoFullScreen extends HTML5VideoView 
        return mVideoSurfaceView;

    }



    @Override

    public void start() {

        if (getAutostart()) {

            super.start();

        }

    }



    HTML5VideoFullScreen(Context context, int videoLayerId, int position,

            boolean autoStart) {

        mVideoSurfaceView = new VideoSurfaceView(context);

core/java/android/webkit/HTML5VideoViewProxy.java

+3 −2
Original line number Diff line number Diff line
@@ -224,8 +224,9 @@ class HTML5VideoViewProxy extends Handler 
        }



        public static void onPrepared() {

            // The VideoView will decide whether to really kick off to play.

            if (!mHTML5VideoView.isFullScreenMode() || mHTML5VideoView.getAutostart()) {

                mHTML5VideoView.start();

            }

            if (mBaseLayer != 0) {

                setBaseLayer(mBaseLayer);

            }