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

Commit 6d8a63d7 authored by Phil Weaver's avatar Phil Weaver Committed by Android (Google) Code Review
Browse files

Merge "Fix a11ynodeinfo parceling"

parents a20833c0 6307240b

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,7 @@ package android.view.accessibility { 


  public class AccessibilityNodeInfo implements android.os.Parcelable {

    method public static void setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger);

    method public void writeToParcelNoRecycle(android.os.Parcel, int);

  }



  public final class AccessibilityWindowInfo implements android.os.Parcelable {

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

+10 −5
Original line number Diff line number Diff line
@@ -3173,6 +3173,15 @@ public class AccessibilityNodeInfo implements Parcelable { 
     */

    @Override

    public void writeToParcel(Parcel parcel, int flags) {

        writeToParcelNoRecycle(parcel, flags);

        // Since instances of this class are fetched via synchronous i.e. blocking

        // calls in IPCs we always recycle as soon as the instance is marshaled.

        recycle();

    }



    /** @hide */

    @TestApi

    public void writeToParcelNoRecycle(Parcel parcel, int flags) {

        // Write bit set of indices of fields with values differing from default

        long nonDefaultFields = 0;

        int fieldIndex = 0; // index of the current field
@@ -3406,10 +3415,6 @@ public class AccessibilityNodeInfo implements Parcelable { 
                        + " vs " + fieldIndex);

            }

        }



        // Since instances of this class are fetched via synchronous i.e. blocking

        // calls in IPCs we always recycle as soon as the instance is marshaled.

        recycle();

    }



    /**
@@ -3557,7 +3562,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
        if (isBitSet(nonDefaultFields, fieldIndex++)) {

            mContentDescription = parcel.readCharSequence();

        }

        if (isBitSet(nonDefaultFields, fieldIndex++)) mPaneTitle = parcel.readString();

        if (isBitSet(nonDefaultFields, fieldIndex++)) mPaneTitle = parcel.readCharSequence();

        if (isBitSet(nonDefaultFields, fieldIndex++)) mTooltipText = parcel.readCharSequence();

        if (isBitSet(nonDefaultFields, fieldIndex++)) mViewIdResourceName = parcel.readString();