Merge "Add Null check for mView.findFocus() in ViewRootImpl" into rvc-qpr-dev

This commit is contained in:
Ming-Shin Lu
2020-11-26 13:50:13 +00:00
committed by Android (Google) Code Review

View File

@@ -3268,8 +3268,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