Merge "Revert "Pass token to AutoFillUI.""

2 files changed, 2 insertions, 5 deletions

diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
index ea74582ff62f..42e4fd3b2b7f 100644
--- a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
+++ b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
@@ -813,7 +813,7 @@ final class AutoFillManagerServiceImpl {
         final int mId;
 
         private Session(int id, IBinder activityToken) {
-            mUi = new AutoFillUI(mContext, this, activityToken);
+            mUi = new AutoFillUI(mContext, this);
             mId = id;
             mActivityToken = new WeakReference<>(activityToken);
         }
diff --git a/services/autofill/java/com/android/server/autofill/AutoFillUI.java b/services/autofill/java/com/android/server/autofill/AutoFillUI.java
index 73f488d39f15..45fedd120021 100644
--- a/services/autofill/java/com/android/server/autofill/AutoFillUI.java
+++ b/services/autofill/java/com/android/server/autofill/AutoFillUI.java
@@ -33,7 +33,6 @@ import android.graphics.Rect;
 import android.graphics.PixelFormat;
 import android.os.Binder;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.util.Slog;
 import android.view.autofill.AutoFillId;
 import android.view.autofill.Dataset;
@@ -64,7 +63,6 @@ final class AutoFillUI {
 
     private final Context mContext;
     private final Session mSession;
-    private final IBinder mAppToken;
     private final WindowManager mWm;
 
     // Fill UI variables
@@ -77,10 +75,9 @@ final class AutoFillUI {
      */
     private View mSnackbar;
 
-    AutoFillUI(Context context, Session session, IBinder appToken) {
+    AutoFillUI(Context context, Session session) {
         mContext = context;
         mSession = session;
-        mAppToken = appToken;
         mWm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
     }