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

Commit 2626853a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ViewRootImpl: Call surface destroy callback after layout pass" into... 

Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6 am: 15f0a259 am: 5a08944e am: 88dd62af

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108557

Change-Id: I53da1cca48329a17ea58df318ec407f2899449bf
parents 349fb412 88dd62af

core/java/android/view/ViewRootImpl.java

+4 −1
Original line number Diff line number Diff line
@@ -2717,7 +2717,6 @@ public final class ViewRootImpl implements ViewParent, 
                            mAttachInfo.mThreadedRenderer.isEnabled()) {

                        mAttachInfo.mThreadedRenderer.destroy();

                    }

                    notifySurfaceDestroyed();

                } else if ((surfaceReplaced

                        || surfaceSizeChanged || windowRelayoutWasForced || colorModeChanged)

                        && mSurfaceHolder == null
@@ -2948,6 +2947,10 @@ public final class ViewRootImpl implements ViewParent, 
            }

        }



        if (surfaceDestroyed) {

            notifySurfaceDestroyed();

        }



        if (triggerGlobalLayoutListener) {

            mAttachInfo.mRecomputeGlobalAttributes = false;

            mAttachInfo.mTreeObserver.dispatchOnGlobalLayout();