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

Commit 344f4d71 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13127785

Change-Id: Ibe6d6e31eeabd857affa6f4dcdb19d875df4309c
parents 0d2517e6 29c2b7e6

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -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