Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4b1fb94 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

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

parents 9303ecb3 208c47cf

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -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();