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

Merge "Handle edge-case where the focus-search root is focused" into oc-dev

Browse Source 
am: fe9ce65491

Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52
This commit is contained in:
Evan Rosky
2017-04-03 23:17:45 +00:00
committed by android-build-merger
parent 1148bc819a fe9ce65491
commit 654281bcd1
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/FocusFinder.java
View File

@@ -118,7 +118,7 @@ public class FocusFinder {
* @return the "effective" root of {@param focused} * @return the "effective" root of {@param focused}
*/ */
private ViewGroup getEffectiveRoot(ViewGroup root, View focused) { private ViewGroup getEffectiveRoot(ViewGroup root, View focused) {
if (focused == null) { if (focused == null || focused == root) {
return root; return root;
} }
ViewParent effective = focused.getParent(); ViewParent effective = focused.getParent();