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

Commit 781261f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix nullptr exception when using do-while" into main am: 2b7e58cd am: fbefa474 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3048189



Change-Id: I1f2044e81f3d20ab8f0e354066565645f9952618
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b9422c3 fbefa474

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;

    }