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

Commit a7579584 authored by Raff Tsai's avatar Raff Tsai Committed by android-build-merger
Browse files

Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev 

am: cd576f15

Change-Id: Id176c6e8e413cc7c85a0ac502f6086aca42cc940
parents b6ea5c43 cd576f15

src/com/android/settings/widget/VideoPreference.java

+9 −5
Original line number Diff line number Diff line
@@ -220,6 +220,9 @@ public class VideoPreference extends Preference { 
    private void initMediaPlayer() {

        if (mMediaPlayer == null) {

            mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);

            // when the playback res is invalid or others, MediaPlayer create may fail

            // and return null, so need add the null judgement.

            if (mMediaPlayer != null) {

                mMediaPlayer.seekTo(0);

                mMediaPlayer.setOnSeekCompleteListener(mp -> mVideoReady = true);

                mMediaPlayer.setOnPreparedListener(mediaPlayer -> mediaPlayer.setLooping(true));
@@ -228,6 +231,7 @@ public class VideoPreference extends Preference { 
                }

            }

        }

    }



    private void releaseMediaPlayer() {

        if (mMediaPlayer != null) {