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

Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev

Browse Source
This commit is contained in:
John Reck
2016-06-10 17:46:53 +00:00
committed by Android (Google) Code Review
parent 9303ecb317 208c47cfb0
commit e4b1fb94e3
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/ViewRootImpl.java
View File

@@ -1938,7 +1938,7 @@ public final class ViewRootImpl implements ViewParent,
mSurfaceHolder.setSurfaceFrameSize(mWidth, mHeight); mSurfaceHolder.setSurfaceFrameSize(mWidth, mHeight);
mSurfaceHolder.mSurfaceLock.unlock(); mSurfaceHolder.mSurfaceLock.unlock();
if (mSurface.isValid()) { if (mSurface.isValid()) {
if (!hadSurface || surfaceGenerationId != mSurface.getGenerationId()) { if (!hadSurface) {
mSurfaceHolder.ungetCallbacks(); mSurfaceHolder.ungetCallbacks();
mIsCreating = true; mIsCreating = true;
@@ -1951,7 +1951,7 @@ public final class ViewRootImpl implements ViewParent,
} }
surfaceChanged = true; surfaceChanged = true;
} }
if (surfaceChanged) { if (surfaceChanged || surfaceGenerationId != mSurface.getGenerationId()) {
mSurfaceHolderCallback.surfaceChanged(mSurfaceHolder, mSurfaceHolderCallback.surfaceChanged(mSurfaceHolder,
lp.format, mWidth, mHeight); lp.format, mWidth, mHeight);
SurfaceHolder.Callback callbacks[] = mSurfaceHolder.getCallbacks(); SurfaceHolder.Callback callbacks[] = mSurfaceHolder.getCallbacks();