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

Commit fdf44966 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... 

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

Change-Id: I752fa4c18e6ebf3eacf2e1094394d761727ac86d
parents 149f2e03 b3b6d96e

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();