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

Commit 654281bc authored by Evan Rosky's avatar Evan Rosky Committed by android-build-merger
Browse files

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

am: fe9ce654

Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52
parents 1148bc81 fe9ce654

core/java/android/view/FocusFinder.java

+1 −1
Original line number Diff line number Diff line
@@ -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();