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

Commit 93ff5124 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

Change-Id: I896ffb151a1b6625fe6b6c937dac9b54f1d5d252
parents df2485cf e4b1fb94

core/java/android/view/ViewRootImpl.java

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