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

Commit 1025620e 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 

am: 654281bc

Change-Id: Ib31d0bb871cebdf963b119ef90921922a5b51b08
parents 38edfd49 654281bc

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();