diff options
| author | Julian Odell <juliano@google.com> | 2021-09-29 04:55:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-09-29 04:55:18 +0000 |
| commit | 84a7a431cc956963851a482dcda718c37158d7d4 (patch) | |
| tree | 5f690f1bd4363bad10f7edfc04fecca5506a92b9 /core/java | |
| parent | c410f2989327390c47986b8c6da7668528e64a1c (diff) | |
| parent | 7c3d133d65926ee79c65619d7ba237bcb9006c06 (diff) | |
Merge "Notify content capture on detach before setting attachInfo to null." into sc-qpr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/View.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f4223fb467f5..cf12955787b1 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -20830,13 +20830,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mPrivateFlags &= ~PFLAG_SCROLL_CONTAINER_ADDED; } + notifyAppearedOrDisappearedForContentCaptureIfNeeded(false); + mAttachInfo = null; if (mOverlay != null) { mOverlay.getOverlayView().dispatchDetachedFromWindow(); } notifyEnterOrExitForAutoFillIfNeeded(false); - notifyAppearedOrDisappearedForContentCaptureIfNeeded(false); } /** |