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

Commit 0732743d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "AccessibilityNodeInfo shouldn\'t touch extras." into nyc-dev am: af64f634 

am: 21b1b0d9

* commit '21b1b0d9':
  AccessibilityNodeInfo shouldn't touch extras.

Change-Id: Icc50a8924830abc942f87fa835b1ae715c86382a
parents 8fff90ca 21b1b0d9

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

+8 −6
Original line number Original line Diff line number Diff line
@@ -2926,8 +2926,10 @@ public class AccessibilityNodeInfo implements Parcelable { 
        mInputType = other.mInputType;

        mInputType = other.mInputType;

        mLiveRegion = other.mLiveRegion;

        mLiveRegion = other.mLiveRegion;

        mDrawingOrderInParent = other.mDrawingOrderInParent;

        mDrawingOrderInParent = other.mDrawingOrderInParent;

        if (other.mExtras != null && !other.mExtras.isEmpty()) {

        if (other.mExtras != null) {

            getExtras().putAll(other.mExtras);

            mExtras = new Bundle(other.mExtras);

        } else {

            mExtras = null;

        }

        }

        mRangeInfo = (other.mRangeInfo != null)

        mRangeInfo = (other.mRangeInfo != null)

                ? RangeInfo.obtain(other.mRangeInfo) : null;

                ? RangeInfo.obtain(other.mRangeInfo) : null;
@@ -3006,7 +3008,9 @@ public class AccessibilityNodeInfo implements Parcelable { 
        mDrawingOrderInParent = parcel.readInt();

        mDrawingOrderInParent = parcel.readInt();





        if (parcel.readInt() == 1) {

        if (parcel.readInt() == 1) {

            getExtras().putAll(parcel.readBundle());

            mExtras = parcel.readBundle();

        } else {

            mExtras = null;

        }

        }





        if (parcel.readInt() == 1) {

        if (parcel.readInt() == 1) {
@@ -3073,9 +3077,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
        mTextSelectionEnd = UNDEFINED_SELECTION_INDEX;

        mTextSelectionEnd = UNDEFINED_SELECTION_INDEX;

        mInputType = InputType.TYPE_NULL;

        mInputType = InputType.TYPE_NULL;

        mLiveRegion = View.ACCESSIBILITY_LIVE_REGION_NONE;

        mLiveRegion = View.ACCESSIBILITY_LIVE_REGION_NONE;

        if (mExtras != null) {

        mExtras = null;

            mExtras.clear();

        }

        if (mRangeInfo != null) {

        if (mRangeInfo != null) {

            mRangeInfo.recycle();

            mRangeInfo.recycle();

            mRangeInfo = null;

            mRangeInfo = null;