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

Merge "Don't crash during layout of non-attached but focused view" into pi-dev

Browse Source 
am: 62bb0802f9

Change-Id: I5b091f4fc17586a80934bbea0437323f794d6465
This commit is contained in:
Evan Rosky
2018-04-19 13:24:41 -07:00
committed by android-build-merger
parent cadb0d5ec8 62bb0802f9
commit 48cca289df
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/View.java
View File

@@ -20700,7 +20700,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if (canTakeFocus()) { if (canTakeFocus()) {
// We have a robust focus, so parents should no longer be wanting focus. // We have a robust focus, so parents should no longer be wanting focus.
clearParentsWantFocus(); clearParentsWantFocus();
} else if (!getViewRootImpl().isInLayout()) { } else if (getViewRootImpl() == null || !getViewRootImpl().isInLayout()) {
// This is a weird case. Most-likely the user, rather than ViewRootImpl, called // This is a weird case. Most-likely the user, rather than ViewRootImpl, called
// layout. In this case, there's no guarantee that parent layouts will be evaluated // layout. In this case, there's no guarantee that parent layouts will be evaluated
// and thus the safest action is to clear focus here. // and thus the safest action is to clear focus here.