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

Commit 9b24e5c5 authored by Adam Powell's avatar Adam Powell
Browse files

Don't crash when passing null to requestChildFocus 

Add null checks to ScrollView and HorizontalScrollView for checking
the revealOnFocusHint. This should never happen in code called by
the framework, but some apps were hitting it.

Bug: 36379645
Test: none
Change-Id: I220eb88d82126ff08f47a7c2a7fbdddebf07de81
parent cd776616

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 {