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

Commit 0e8e7830 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

Change-Id: Ibadc5f3fa1b2cd67998215a132f73bde7f1f4511
parents 9adc60ff 4dfeb4f0

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) {