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

Commit b3b6d96e authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge \\"Don\\'t call surfaceCreated for just changed surfaces\\" into nyc-dev am: e4b1fb94 

am: 93ff5124

Change-Id: I7b53bc90c0f4edbf1482924d02fd6361884a7860
parents 47126222 93ff5124

core/java/android/view/ViewRootImpl.java

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