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

Commit c1bce3de authored by James Cook's avatar James Cook Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in UndoManager after parceling TextView"

parents 445e1c5d f143ace3

core/java/android/content/UndoManager.java

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ public class UndoManager { 
            owner.mSavedIdx = mNextSavedIdx;

            out.writeInt(owner.mSavedIdx);

            out.writeString(owner.mTag);

            out.writeInt(owner.mOpCount);

            mNextSavedIdx++;

        }

    }
@@ -200,7 +201,9 @@ public class UndoManager { 
        UndoOwner owner = mStateOwners[idx];

        if (owner == null) {

            String tag = in.readString();

            int opCount = in.readInt();

            owner = new UndoOwner(tag, this);

            owner.mOpCount = opCount;

            mStateOwners[idx] = owner;

            mOwners.put(tag, owner);

        }

core/java/android/content/UndoOwner.java

+11 −0
Original line number Diff line number Diff line
@@ -61,4 +61,15 @@ public class UndoOwner { 
    public Object getData() {

        return mData;

    }



    @Override

    public String toString() {

        return "UndoOwner:[mTag=" + mTag +

                " mManager=" + mManager +

                " mData=" + mData +

                " mData=" + mData +

                " mOpCount=" + mOpCount +

                " mStateSeq=" + mStateSeq +

                " mSavedIdx=" + mSavedIdx + "]";

    }

}