From 17345072864b9aeb4e5535257e83e6809859ae0f Mon Sep 17 00:00:00 2001
From: Jae Seo <jaeseo@google.com>
Date: Sat, 20 Jun 2015 23:02:29 -0700
Subject: [PATCH] TIF: Always flush pending app-private commands when resetting
 TvView

Bug: 19809952
Change-Id: Ic676b81591def065d79ac45cb1d247b67178e50b
---
 media/java/android/media/tv/TvView.java | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java
index e7ce1dd7613bc..d8d0bdc8a44eb 100644
--- a/media/java/android/media/tv/TvView.java
+++ b/media/java/android/media/tv/TvView.java
@@ -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;