PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: cd576f15a3

Change-Id: Id176c6e8e413cc7c85a0ac502f6086aca42cc940
This commit is contained in:
Raff Tsai
2019-04-10 11:08:54 -07:00
committed by android-build-merger
parent b6ea5c437a cd576f15a3
commit a75795840e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/widget/VideoPreference.java
View File

@@ -220,11 +220,15 @@ public class VideoPreference extends Preference {
private void initMediaPlayer() { private void initMediaPlayer() {
if (mMediaPlayer == null) { if (mMediaPlayer == null) {
mMediaPlayer = MediaPlayer.create(mContext, mVideoPath); mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
mMediaPlayer.seekTo(0); // when the playback res is invalid or others, MediaPlayer create may fail
mMediaPlayer.setOnSeekCompleteListener(mp -> mVideoReady = true); // and return null, so need add the null judgement.
mMediaPlayer.setOnPreparedListener(mediaPlayer -> mediaPlayer.setLooping(true)); if (mMediaPlayer != null) {
if (mSurface != null) { mMediaPlayer.seekTo(0);
mMediaPlayer.setSurface(mSurface); mMediaPlayer.setOnSeekCompleteListener(mp -> mVideoReady = true);
mMediaPlayer.setOnPreparedListener(mediaPlayer -> mediaPlayer.setLooping(true));
if (mSurface != null) {
mMediaPlayer.setSurface(mSurface);
}
} }
} }
} }