Merge "Settings: fix the NullPointerException when initiating media player" into qt-dev (cd576f15) · Commits · e / os / android_packages_apps_Settings

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) {