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

Commit 0d06f2d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "VideoView2Impl: use getState instead of isPlaying"

parents 18dca5ef 44d42093

packages/MediaComponents/src/com/android/widget/VideoView2Impl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -407,7 +407,7 @@ public class VideoView2Impl extends BaseLayout 
            return;

            return;

        }

        }

        mSpeed = speed;

        mSpeed = speed;

        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {

        if (mMediaPlayer != null && mMediaPlayer.getState() == MediaPlayer2.PLAYER_STATE_PLAYING) {

            applySpeed();

            applySpeed();

        }

        }

        updatePlaybackState();

        updatePlaybackState();
@@ -1341,7 +1341,7 @@ public class VideoView2Impl extends BaseLayout 
                if (isRemotePlayback()) {

                if (isRemotePlayback()) {

                    mRoutePlayer.onPause();

                    mRoutePlayer.onPause();

                    mCurrentState = STATE_PAUSED;

                    mCurrentState = STATE_PAUSED;

                } else if (mMediaPlayer.isPlaying()) {

                } else if (mMediaPlayer.getState() == MediaPlayer2.PLAYER_STATE_PLAYING) {

                    mMediaPlayer.pause();

                    mMediaPlayer.pause();

                    mCurrentState = STATE_PAUSED;

                    mCurrentState = STATE_PAUSED;

                    updatePlaybackState();

                    updatePlaybackState();