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

Commit 709c0a1c authored by Tony Mak's avatar Tony Mak
Browse files

Put userId at the end of parcel 

userId is a new field added in ag/8350816, and it is written in between
some old fields when we parcelize it.

That breaks AiAi because some of its code rely on the implementation
details of SelectionEvent.writeToParcel.

In the long run, we may want to update AiAi such that it works
without this assumption, but before that, let's fix that in platform
for now.

Bug: 145962464
Bug: 123232892

Test: atest FrameworksCoreTests:android.view.textclassifier.SelectionEventTest

hange-Id: I98137a095cddf0fb4c600e1e09eef507bb750528
parent c6cb5510

core/java/android/view/textclassifier/SelectionEvent.java

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ public final class SelectionEvent implements Parcelable { 
        mEntityType = in.readString();

        mWidgetVersion = in.readInt() > 0 ? in.readString() : null;

        mPackageName = in.readString();

        mUserId = in.readInt();

        mWidgetType = in.readString();

        mInvocationMethod = in.readInt();

        mResultId = in.readString();
@@ -175,6 +174,7 @@ public final class SelectionEvent implements Parcelable { 
        mEnd = in.readInt();

        mSmartStart = in.readInt();

        mSmartEnd = in.readInt();

        mUserId = in.readInt();

    }



    @Override
@@ -188,7 +188,6 @@ public final class SelectionEvent implements Parcelable { 
            dest.writeString(mWidgetVersion);

        }

        dest.writeString(mPackageName);

        dest.writeInt(mUserId);

        dest.writeString(mWidgetType);

        dest.writeInt(mInvocationMethod);

        dest.writeString(mResultId);
@@ -204,6 +203,7 @@ public final class SelectionEvent implements Parcelable { 
        dest.writeInt(mEnd);

        dest.writeInt(mSmartStart);

        dest.writeInt(mSmartEnd);

        dest.writeInt(mUserId);

    }



    @Override