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

Commit d4c5b765 authored by Chih-Chung Chang's avatar Chih-Chung Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug that the condition for play/pause was reversed."

parents c2c9a249 d7db7012

core/java/android/widget/VideoView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -534,14 +534,14 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
                }

                }

                return true;

                return true;

            } else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {

            } else if (keyCode == KeyEvent.KEYCODE_MEDIA_PLAY) {

                if (mMediaPlayer.isPlaying()) {

                if (!mMediaPlayer.isPlaying()) {

                    start();

                    start();

                    mMediaController.hide();

                    mMediaController.hide();

                }

                }

                return true;

                return true;

            } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP

            } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP

                    || keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {

                    || keyCode == KeyEvent.KEYCODE_MEDIA_PAUSE) {

                if (!mMediaPlayer.isPlaying()) {

                if (mMediaPlayer.isPlaying()) {

                    pause();

                    pause();

                    mMediaController.show();

                    mMediaController.show();

                }

                }