Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c3d133d authored by Julian Odell's avatar Julian Odell
Browse files

Notify content capture on detach before setting attachInfo to null. 

If a view is detached before being removed (which seems common with some
recycler list views) then no content capture view removed event is sent
(notifyAppearedOrDisappearedForContentCaptureIfNeeded does nothing
if mAttachInfo is null).

Fix: 200166989
Test: Manual verification using AiAi logging
Change-Id: Ic04af005bb4ad425ba8398439f1f47bb6bcb334c
parent be0bdf61

core/java/android/view/View.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -20830,13 +20830,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            mPrivateFlags &= ~PFLAG_SCROLL_CONTAINER_ADDED;

            mPrivateFlags &= ~PFLAG_SCROLL_CONTAINER_ADDED;

        }

        }




















        notifyAppearedOrDisappearedForContentCaptureIfNeeded(false);
























        mAttachInfo = null;







        mAttachInfo = null;











        if (mOverlay != null) {







        if (mOverlay != null) {











            mOverlay.getOverlayView().dispatchDetachedFromWindow();







            mOverlay.getOverlayView().dispatchDetachedFromWindow();











        }







        }



























        notifyEnterOrExitForAutoFillIfNeeded(false);







        notifyEnterOrExitForAutoFillIfNeeded(false);











        notifyAppearedOrDisappearedForContentCaptureIfNeeded(false);














    }







    }



























    /**







    /**