Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Put userId at the end of parcel" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-13 18:50:54 +00:00
committed by Android (Google) Code Review
parent d98efda2ba 642c22b223
commit 899f8301e0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/textclassifier/SelectionEvent.java
View File

@@ -161,7 +161,6 @@ public final class SelectionEvent implements Parcelable {
mEntityType = in.readString(); mEntityType = in.readString();
mWidgetVersion = in.readInt() > 0 ? in.readString() : null; mWidgetVersion = in.readInt() > 0 ? in.readString() : null;
mPackageName = in.readString(); mPackageName = in.readString();
mUserId = in.readInt();
mWidgetType = in.readString(); mWidgetType = in.readString();
mInvocationMethod = in.readInt(); mInvocationMethod = in.readInt();
mResultId = in.readString(); mResultId = in.readString();
@@ -175,6 +174,7 @@ public final class SelectionEvent implements Parcelable {
mEnd = in.readInt(); mEnd = in.readInt();
mSmartStart = in.readInt(); mSmartStart = in.readInt();
mSmartEnd = in.readInt(); mSmartEnd = in.readInt();
mUserId = in.readInt();
} }
@Override @Override
@@ -188,7 +188,6 @@ public final class SelectionEvent implements Parcelable {
dest.writeString(mWidgetVersion); dest.writeString(mWidgetVersion);
} }
dest.writeString(mPackageName); dest.writeString(mPackageName);
dest.writeInt(mUserId);
dest.writeString(mWidgetType); dest.writeString(mWidgetType);
dest.writeInt(mInvocationMethod); dest.writeInt(mInvocationMethod);
dest.writeString(mResultId); dest.writeString(mResultId);
@@ -204,6 +203,7 @@ public final class SelectionEvent implements Parcelable {
dest.writeInt(mEnd); dest.writeInt(mEnd);
dest.writeInt(mSmartStart); dest.writeInt(mSmartStart);
dest.writeInt(mSmartEnd); dest.writeInt(mSmartEnd);
dest.writeInt(mUserId);
} }
@Override @Override