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

Commit c921f276 authored by Alan Viverette's avatar Alan Viverette
Browse files

Avoid sealed check when unparceling AccessibilityNodeInfo 

Previously the unparceling code relied on addAction(), which would
incorrectly crash if the node was sealed.

Bug: 21135077
Change-Id: I773ac27b2dee501ffea0a0587536a192af402c32
parent 9cb90cbb

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

+6 −2
Original line number Diff line number Diff line
@@ -1011,6 +1011,10 @@ public class AccessibilityNodeInfo implements Parcelable { 
    public void addAction(AccessibilityAction action) {

        enforceNotSealed();



        addActionUnchecked(action);

    }



    private void addActionUnchecked(AccessibilityAction action) {

        if (action == null) {

            return;

        }
@@ -2846,9 +2850,9 @@ public class AccessibilityNodeInfo implements Parcelable { 
            addLegacyStandardActions(legacyStandardActions);

            final int nonLegacyActionCount = actionCount - Integer.bitCount(legacyStandardActions);

            for (int i = 0; i < nonLegacyActionCount; i++) {

                AccessibilityAction action = new AccessibilityAction(

                final AccessibilityAction action = new AccessibilityAction(

                        parcel.readInt(), parcel.readCharSequence());

                addAction(action);

                addActionUnchecked(action);

            }

        }