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: Ia2a5f3d17b0a7d4803f0c6089574a4f4fb063c6a
2021-09-29 05:08:35 +00:00
parent ae8b46904a 84a7a431cc
commit ae1afdd8eb
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -20889,13 +20889,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);
    }

    /**