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

2017-04-03 23:10:48 +00:00
parent 265dbc1f09 e55f4a611e
commit fe9ce65491
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/FocusFinder.java
+++ b/core/java/android/view/FocusFinder.java
@@ -118,7 +118,7 @@ public class FocusFinder {
     * @return the "effective" root of {@param focused}
     */
    private ViewGroup getEffectiveRoot(ViewGroup root, View focused) {
-        if (focused == null) {
+        if (focused == null || focused == root) {
            return root;
        }
        ViewParent effective = focused.getParent();