Merge "MediaPlayer: use local variable to check whether mTimeProvider is null." (4a4a7f46) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer.java

+26 −15

Original line number	Diff line number	Diff line
		@@ -2602,15 +2602,21 @@ public class MediaPlayer implements SubtitleController.Listener
		return;

		case MEDIA_STOPPED:
		if (mTimeProvider != null) {
		mTimeProvider.onStopped();
		{
		TimeProvider timeProvider = mTimeProvider;
		if (timeProvider != null) {
		timeProvider.onStopped();
		}
		}
		break;

		case MEDIA_STARTED:
		case MEDIA_PAUSED:
		if (mTimeProvider != null) {
		mTimeProvider.onPaused(msg.what == MEDIA_PAUSED);
		{
		TimeProvider timeProvider = mTimeProvider;
		if (timeProvider != null) {
		timeProvider.onPaused(msg.what == MEDIA_PAUSED);
		}
		}
		break;

		@@ -2626,14 +2632,19 @@ public class MediaPlayer implements SubtitleController.Listener
		// fall through

		case MEDIA_SKIPPED:
		if (mTimeProvider != null) {
		mTimeProvider.onSeekComplete(mMediaPlayer);
		{
		TimeProvider timeProvider = mTimeProvider;
		if (timeProvider != null) {
		timeProvider.onSeekComplete(mMediaPlayer);
		}
		}
		return;

		case MEDIA_SET_VIDEO_SIZE:
		if (mOnVideoSizeChangedListener != null)
		mOnVideoSizeChangedListener.onVideoSizeChanged(mMediaPlayer, msg.arg1, msg.arg2);
		if (mOnVideoSizeChangedListener != null) {
		mOnVideoSizeChangedListener.onVideoSizeChanged(
		mMediaPlayer, msg.arg1, msg.arg2);
		}
		return;

		case MEDIA_ERROR: