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

Merge "SurfaceView: Avoid initializing Surface from an invalid SurfaceControl." into oc-dev am: 401b8907d0

Browse Source 
am: 2f927d56cf

Change-Id: I2916aa9a24b84d4f379c8ebebc7e19eb4adc96f4
This commit is contained in:
Robert Carr
2017-07-07 03:29:06 +00:00
committed by android-build-merger
parent b8d185f2b5 2f927d56cf
commit 7de9f7a334
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,10 +491,10 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb
if (myHeight <= 0) myHeight = getHeight();
final boolean formatChanged = mFormat != mRequestedFormat;
final boolean creating = (mSurfaceControl == null || formatChanged)
final boolean visibleChanged = mVisible != mRequestedVisible;
final boolean creating = (mSurfaceControl == null || formatChanged || visibleChanged)
&& mRequestedVisible;
final boolean sizeChanged = mSurfaceWidth != myWidth || mSurfaceHeight != myHeight;
final boolean visibleChanged = mVisible != mRequestedVisible;
final boolean windowVisibleChanged = mWindowVisibility != mLastWindowVisibility;
boolean redrawNeeded = false;