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

Commit df50b648 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't crash when passing null to requestChildFocus" into oc-dev

parents b28e1e68 9b24e5c5

core/java/android/widget/HorizontalScrollView.java

+1 −1
Original line number Diff line number Diff line
@@ -1443,7 +1443,7 @@ public class HorizontalScrollView extends FrameLayout { 


    @Override

    public void requestChildFocus(View child, View focused) {

        if (focused.getRevealOnFocusHint()) {

        if (focused != null && focused.getRevealOnFocusHint()) {

            if (!mIsLayoutDirty) {

                scrollToChild(focused);

            } else {

core/java/android/widget/ScrollView.java

+1 −1
Original line number Diff line number Diff line
@@ -1468,7 +1468,7 @@ public class ScrollView extends FrameLayout { 


    @Override

    public void requestChildFocus(View child, View focused) {

        if (focused.getRevealOnFocusHint()) {

        if (focused != null && focused.getRevealOnFocusHint()) {

            if (!mIsLayoutDirty) {

                scrollToChild(focused);

            } else {