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

Commit aea739b3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Put userId at the end of parcel" into qt-dev am: 899f8301 am: 056b56c6 

Change-Id: Id17055f72243306cac9e46abff2cf313492f5e7c
parents 480ea64a 056b56c6

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