diff options
author | Jae Seo <jaeseo@google.com> | 2015-06-20 23:02:29 -0700 |
---|---|---|
committer | Jae Seo <jaeseo@google.com> | 2015-06-20 23:02:29 -0700 |
commit | 17345072864b9aeb4e5535257e83e6809859ae0f (patch) | |
tree | 102534be526f84296b321d4f3b5662374dc73165 /media | |
parent | 3ac465a7d830a973096b4f69ef4531f09dcdf07c (diff) | |
download | frameworks_base-17345072864b9aeb4e5535257e83e6809859ae0f.zip frameworks_base-17345072864b9aeb4e5535257e83e6809859ae0f.tar.gz frameworks_base-17345072864b9aeb4e5535257e83e6809859ae0f.tar.bz2 |
TIF: Always flush pending app-private commands when resetting TvView
Bug: 19809952
Change-Id: Ic676b81591def065d79ac45cb1d247b67178e50b
Diffstat (limited to 'media')
-rw-r--r-- | media/java/android/media/tv/TvView.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java index e7ce1dd..d8d0bdc 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; |