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

Commit 920fbae9 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "removeAllViews should also clean-up focusedInCluster" into... 

Merge "Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev am: 7666d6f9 am: adcc61d6"
parents 779f55d6 b2e1fec1

core/java/android/view/ViewGroup.java

+3 −0
Original line number Diff line number Diff line
@@ -5414,6 +5414,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        if (mDefaultFocus != null) {

            clearDefaultFocus(mDefaultFocus);

        }

        if (mFocusedInCluster != null) {

            clearFocusedInCluster(mFocusedInCluster);

        }

        if (clearChildFocus) {

            clearChildFocus(focused);

            if (!rootViewRequestFocus()) {