Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev

2020-07-09 16:32:33 +00:00
parent 5a293b8eb2 019e08fdbb
commit 276abcb6b3
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2725,7 +2725,6 @@ public final class ViewRootImpl implements ViewParent,
                            mAttachInfo.mThreadedRenderer.isEnabled()) {
                        mAttachInfo.mThreadedRenderer.destroy();
                    }
-                    notifySurfaceDestroyed();
                } else if ((surfaceReplaced
                        || surfaceSizeChanged || windowRelayoutWasForced || colorModeChanged)
                        && mSurfaceHolder == null
@@ -2956,6 +2955,10 @@ public final class ViewRootImpl implements ViewParent,
            }
        }

+        if (surfaceDestroyed) {
+            notifySurfaceDestroyed();
+        }
+
        if (triggerGlobalLayoutListener) {
            mAttachInfo.mRecomputeGlobalAttributes = false;
            mAttachInfo.mTreeObserver.dispatchOnGlobalLayout();