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

Commit 33c1bc58 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Reset pointer icon when view is not present 

Sometimes pointer change request is delivered after view is detached from its
ViewRootImpl. E.g. when popup is present click outside to close it.

Bug: 27292939
Change-Id: I925728af334a1e1ae53f7e530d639e50b0c37f2b
parent 49607029

core/java/android/view/ViewRootImpl.java

+7 −1
Original line number Diff line number Diff line
@@ -4393,8 +4393,14 @@ public final class ViewRootImpl implements ViewParent, 
    private boolean updatePointerIcon(MotionEvent event) {

        final float x = event.getX();

        final float y = event.getY();

        if (mView == null) {

            // E.g. click outside a popup to dismiss it

            Slog.d(mTag, "updatePointerIcon called after view was removed");

            return false;

        }

        if (x < 0 || x >= mView.getWidth() || y < 0 || y >= mView.getHeight()) {

            Slog.e(mTag, "updatePointerIcon called with position out of bounds");

            // E.g. when moving window divider with mouse

            Slog.d(mTag, "updatePointerIcon called with position out of bounds");

            return false;

        }

        final PointerIcon pointerIcon = mView.getPointerIcon(event, x, y);