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

Commit 4dfeb4f0 authored by Phil Weaver's avatar Phil Weaver Committed by Android (Google) Code Review
Browse files

Merge "Add null check in a11y callback" into oc-mr1-dev

parents 133d4881 05a2982f

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -7714,7 +7714,7 @@ public final class ViewRootImpl implements ViewParent, 
        public void onAccessibilityStateChanged(boolean enabled) {

        public void onAccessibilityStateChanged(boolean enabled) {

            if (enabled) {

            if (enabled) {

                ensureConnection();

                ensureConnection();

                if (mAttachInfo.mHasWindowFocus) {

                if (mAttachInfo.mHasWindowFocus && (mView != null)) {

                    mView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

                    mView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

                    View focusedView = mView.findFocus();

                    View focusedView = mView.findFocus();

                    if (focusedView != null && focusedView != mView) {

                    if (focusedView != null && focusedView != mView) {