commit 899f8301e00641b17ad0e0ba8a75a17510f0c4f9
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 13 18:50:54 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 13 18:50:54 2019 +0000
tree 6961dd741da280952541c124c70f5adfaa577c17
parent d98efda2ba2cd126da51531e4b9235c61e650f27
parent 642c22b223e40459d74332b629692a94de99ec9a

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

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

diff --git a/core/java/android/view/textclassifier/SelectionEvent.java b/core/java/android/view/textclassifier/SelectionEvent.java
index 5c81664..ae9d5c6 100644
--- a/core/java/android/view/textclassifier/SelectionEvent.java
+++ b/core/java/android/view/textclassifier/SelectionEvent.java
@@ -161,7 +161,6 @@
         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 @@
         mEnd = in.readInt();
         mSmartStart = in.readInt();
         mSmartEnd = in.readInt();
+        mUserId = in.readInt();
     }
 
     @Override
@@ -188,7 +188,6 @@
             dest.writeString(mWidgetVersion);
         }
         dest.writeString(mPackageName);
-        dest.writeInt(mUserId);
         dest.writeString(mWidgetType);
         dest.writeInt(mInvocationMethod);
         dest.writeString(mResultId);
@@ -204,6 +203,7 @@
         dest.writeInt(mEnd);
         dest.writeInt(mSmartStart);
         dest.writeInt(mSmartEnd);
+        dest.writeInt(mUserId);
     }
 
     @Override