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

Commit af0d984a authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

resolved conflicts for merge of b0267e28 to master 

Change-Id: Ic65ab83958b2e6bb941fe015b557fd2fd8f80683
parents 35e6a685 b0267e28

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

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
     */

    public AccessibilityNodeInfo getParent() {

        enforceSealed();

        if (!canPerformRequestOverConnection(mSourceNodeId)) {

        if (!canPerformRequestOverConnection(mParentNodeId)) {

            return null;

        }

        AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance();