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

Commit 4ef96d79 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add Null check for mView.findFocus() in ViewRootImpl"

parents 78c2acc0 bdaa14bf
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -3234,8 +3234,8 @@ public final class ViewRootImpl implements ViewParent,

            // Note: must be done after the focus change callbacks,
            // so all of the view state is set up correctly.
            mImeFocusController.onPostWindowFocus(mView.findFocus(), hasWindowFocus,
                    mWindowAttributes);
            mImeFocusController.onPostWindowFocus(mView != null ? mView.findFocus() : null,
                    hasWindowFocus, mWindowAttributes);

            if (hasWindowFocus) {
                // Clear the forward bit.  We can just do this directly, since