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

Commit 7c886acf authored by Mindy Pereira's avatar Mindy Pereira Committed by Android (Google) Code Review
Browse files

Merge "Perform null check on empty view before doing accessibility check."

parents a0e9d0f6 f9373139

core/java/android/widget/AdapterView.java

+2 −1
Original line number Diff line number Diff line
@@ -650,7 +650,8 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { 
        mEmptyView = emptyView;



        // If not explicitly specified this view is important for accessibility.

        if (emptyView.getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {

        if (emptyView != null

                && emptyView.getImportantForAccessibility() == IMPORTANT_FOR_ACCESSIBILITY_AUTO) {

            emptyView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);

        }