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

Commit 2b7e58cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix nullptr exception when using do-while" into main

parents 9cdfcfb2 998a2bbb

core/java/android/view/FocusFinder.java

+2 −2
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class FocusFinder { 
        }

        ViewGroup effective = null;

        ViewParent nextParent = focused.getParent();

        do {

        while (nextParent instanceof ViewGroup) {

            if (nextParent == root) {

                return effective != null ? effective : root;

            }
@@ -143,7 +143,7 @@ public class FocusFinder { 
                effective = vg;

            }

            nextParent = nextParent.getParent();

        } while (nextParent instanceof ViewGroup);

        }

        return root;

    }