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

Commit 3dbb70ec authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev 

* commit '86bbf705':
  Settings crash after enabling TalkBack accessibility.
parents a8e46828 86bbf705

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -432,9 +432,11 @@ public class AccessibilityNodeInfo implements Parcelable { 
        final int rootAccessibilityViewId =

            (root != null) ? root.getAccessibilityViewId() : UNDEFINED;

        mSourceNodeId = makeNodeId(rootAccessibilityViewId, virtualDescendantId);

        if (root != null) {

            mActualAndReportedWindowLeftDelta = root.getActualAndReportedWindowLeftDelta();

            mActualAndReportedWindowTopDelta = root.getActualAndReportedWindowTopDelta();

        }

    }



    /**

     * Find the view that has the specified focus type. The search starts from

services/java/com/android/server/accessibility/AccessibilityInputFilter.java

+3 −1
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ public class AccessibilityInputFilter extends InputFilter { 
    }



    public void onAccessibilityEvent(AccessibilityEvent event) {

        if (mTouchExplorer != null) {

            mTouchExplorer.onAccessibilityEvent(event);

        }

    }

}