Merge "Notify content capture on detach before setting attachInfo to null." into sc-qpr1-dev am: 84a7a431cc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935219 Change-Id: I73de6397331655133f2e00ee1580ae09182afd76
2021-09-29 05:08:35 +00:00
parent 5eea9d8d27 84a7a431cc
commit 13b149c56b
1 changed files with 2 additions and 1 deletions
--- 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);
    }

    /**