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

Commit 6307240b authored by Phil Weaver's avatar Phil Weaver
Browse files

Fix a11ynodeinfo parceling 

The pane title was not parceled and unparceled symmetrically.
Fixing that.

Also, the CTS test that should have caught this error is broken.
Providing a test API to do parceling without recycling, so
parceling can be tested in isolation.

Bug: 73084962

Test: Updated CTS AccessibilityNodeInfoTest used to pass. After
the fix to parcel in isolation, the test failed. Fixing the pane
title parceling allows the test to pass again.

Change-Id: I161ce93f8bdea5d5dd2d28cd38b58633f7742e56
parent 367358ec

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ package android { 
    field public static final java.lang.String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission.BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";

    field public static final java.lang.String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission.BIND_SETTINGS_SUGGESTIONS_SERVICE";

    field public static final java.lang.String BIND_TELEPHONY_DATA_SERVICE = "android.permission.BIND_TELEPHONY_DATA_SERVICE";

    field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";

    field public static final java.lang.String BIND_TELEPHONY_NETWORK_SERVICE = "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";

    field public static final java.lang.String BIND_TEXTCLASSIFIER_SERVICE = "android.permission.BIND_TEXTCLASSIFIER_SERVICE";

    field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";

    field public static final java.lang.String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";

    field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,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();