Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ibe6d6e31eeabd857affa6f4dcdb19d875df4309c
This commit is contained in:
Ming-Shin Lu
2020-11-26 14:01:15 +00:00
committed by Automerger Merge Worker
parent 0d2517e697 29c2b7e6e3
commit 344f4d7107
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/ViewRootImpl.java
View File

@@ -3268,8 +3268,8 @@ public final class ViewRootImpl implements ViewParent,
// Note: must be done after the focus change callbacks, // Note: must be done after the focus change callbacks,
// so all of the view state is set up correctly. // so all of the view state is set up correctly.
mImeFocusController.onPostWindowFocus(mView.findFocus(), hasWindowFocus, mImeFocusController.onPostWindowFocus(mView != null ? mView.findFocus() : null,
mWindowAttributes); hasWindowFocus, mWindowAttributes);
if (hasWindowFocus) { if (hasWindowFocus) {
// Clear the forward bit. We can just do this directly, since // Clear the forward bit. We can just do this directly, since