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

Commit d17e402a authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Add null check in a11y callback" into oc-mr1-dev am: 4dfeb4f0 

am: 0e8e7830

Change-Id: I88c8d335a4b91072d5e9bfcc4c2a7b21ec46565b
parents 3933c79c 0e8e7830

core/java/android/view/ViewRootImpl.java

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

            if (enabled) {

                ensureConnection();

                if (mAttachInfo.mHasWindowFocus) {

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

                    mView.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);

                    View focusedView = mView.findFocus();

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