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

Commit 5b4cd6c5 authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

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

am: 3da2903a

Change-Id: I7d6a8e541308aba1ca67381f1a0fc070d627938f
parents 0dce786e 3da2903a

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 {