Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Always flush pending app-private commands when resetting TvView" into mnc-dev

Browse Source
This commit is contained in:
Jae Seo
2015-06-21 20:47:06 +00:00
committed by Android (Google) Code Review
parent 5ab0ae0e38 1734507286
commit 99a242c363
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/java/android/media/tv/TvView.java
View File

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