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 am: cd576f15a3

Browse Source 
am: a75795840e

Change-Id: I702d0d79277933e690c44f7d75d27b7ff98dd2f6
This commit is contained in:
Raff Tsai
2019-04-10 12:06:46 -07:00
committed by android-build-merger
parent 7425e5a577 a75795840e
commit 4bbb0542a2
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() {
if (mMediaPlayer == null) {
mMediaPlayer = MediaPlayer.create(mContext, mVideoPath);
mMediaPlayer.seekTo(0);
mMediaPlayer.setOnSeekCompleteListener(mp -> mVideoReady = true);
mMediaPlayer.setOnPreparedListener(mediaPlayer -> mediaPlayer.setLooping(true));
if (mSurface != null) {
mMediaPlayer.setSurface(mSurface);
// 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));
if (mSurface != null) {
mMediaPlayer.setSurface(mSurface);
}
}
}
}