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 
am: e4b1fb94e3

Change-Id: I896ffb151a1b6625fe6b6c937dac9b54f1d5d252
This commit is contained in:
John Reck
2016-06-10 18:02:20 +00:00
committed by android-build-merger
parent df2485cf48 e4b1fb94e3
commit 93ff5124c6
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.mSurfaceLock.unlock();
if (mSurface.isValid()) {
if (!hadSurface || surfaceGenerationId != mSurface.getGenerationId()) {
if (!hadSurface) {
mSurfaceHolder.ungetCallbacks();
mIsCreating = true;
@@ -1951,7 +1951,7 @@ public final class ViewRootImpl implements ViewParent,
}
surfaceChanged = true;
}
if (surfaceChanged) {
if (surfaceChanged || surfaceGenerationId != mSurface.getGenerationId()) {
mSurfaceHolderCallback.surfaceChanged(mSurfaceHolder,
lp.format, mWidth, mHeight);
SurfaceHolder.Callback callbacks[] = mSurfaceHolder.getCallbacks();