Merge "TIF: Always flush pending app-private commands when resetting TvView" into mnc-dev (99a242c3) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/TvView.java

+7 −12

Original line number	Diff line number	Diff line
		@@ -337,8 +337,14 @@ public class TvView extends ViewGroup {
		}

		private void resetInternal() {
		mPendingAppPrivateCommands.clear();
		if (mSession != null) {
		release();
		setSessionSurface(null);
		removeSessionOverlayView();
		mUseRequestedSurfaceLayout = false;
		mSession.release();
		mSession = null;
		mSessionCallback = null;
		resetSurfaceView();
		}
		}
		@@ -738,17 +744,6 @@ public class TvView extends ViewGroup {
		addView(mSurfaceView);
		}

		private void release() {
		mPendingAppPrivateCommands.clear();

		setSessionSurface(null);
		removeSessionOverlayView();
		mUseRequestedSurfaceLayout = false;
		mSession.release();
		mSession = null;
		mSessionCallback = null;
		}

		private void setSessionSurface(Surface surface) {
		if (mSession == null) {
		return;