diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-09 16:55:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 16:55:11 +0000 |
| commit | 0238551d6dbb731c36d10ea5211aa9f3e4f60419 (patch) | |
| tree | 151e95ba6537306e19ac6d38f9e979af798ccad9 /core/java | |
| parent | ff1cbcc78098872481ea12b65a28ef4fd060a04d (diff) | |
| parent | 15f0a2590abbe75d28c563bdfef528e82afb8b50 (diff) | |
Merge "ViewRootImpl: Call surface destroy callback after layout pass" into rvc-dev am: 276abcb6b3 am: 15f0a2590a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108557
Change-Id: I346b0ff2ef76aa176d5a1f21cf8e98c29a88049a
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(); |