diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-09 17:06:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 17:06:58 +0000 |
| commit | 88dd62af5a3229f6dca6dafeb2fd1655df157efa (patch) | |
| tree | 8ff9dd48ea4242335ff350e7c66d7eb6dcd6ec9d /core/java | |
| parent | 71e762fa310addc71604f0bff767c9542d26ece1 (diff) | |
| parent | 5a08944e478e1ada017997f539d3cf69699f7d3c (diff) | |
Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6b3 am: 15f0a2590a am: 5a08944e47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108557
Change-Id: I746fd9dafd07400c149b8a15016f9770596f44b6
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index a58642517a20..f028a28f1d2b 100644 --- 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(); |