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

Commit 30d86e51 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 7124 into donut

* changes:
  Fixes #1977685. Prevent crash when the soft keyboard is brought up.
parents 4caac2bb e8b16525
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -1367,6 +1367,15 @@ public final class ViewRoot extends Handler implements ViewParent,
            // is non-null and we just want to scroll to whatever that
            // rectangle is).
            View focus = mRealFocusedView;

            // When in touch mode, focus points to the previously focused view,
            // which may have been removed from the view hierarchy. The following
            // line checks whether the view is still in the hierarchy
            if (focus == null || focus.getParent() == null) {
                mRealFocusedView = null;
                return false;
            }

            if (focus != mLastScrolledFocus) {
                // If the focus has changed, then ignore any requests to scroll
                // to a rectangle; first we want to make sure the entire focus