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

Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-30 23:05:46 +00:00
committed by Android (Google) Code Review
parent ab262da7df 6ba466ff3e
commit 00515f8eab
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/SurfaceView.java
View File

@@ -598,9 +598,11 @@ public class SurfaceView extends View {
// surfaceDestroyed and surfaceCreated, we force a disconnect, // surfaceDestroyed and surfaceCreated, we force a disconnect,
// so the next connect will always work if we end up reusing // so the next connect will always work if we end up reusing
// the surface. // the surface.
if (mSurface.isValid()) {
mSurface.forceScopedDisconnect(); mSurface.forceScopedDisconnect();
} }
} }
}
mSurface.transferFrom(mNewSurface); mSurface.transferFrom(mNewSurface);
if (visible && mSurface.isValid()) { if (visible && mSurface.isValid()) {