commit c71593e3de3de4505426f435c46d20102b4b06cf
author Svetoslav Ganov <svetoslavganov@google.com> Mon Feb 06 04:01:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 06 04:01:13 2017 +0000
tree 42a5da6213e16d8658f728589124b4fbfff62039
parent 210d6176df5ce6e568071ab54d899cad15fa5db3
parent 21e67a1272b3a1c42df49bec38e227ce2f05ca1d

Merge "Revert "Pass token to AutoFillUI.""

services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java

diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java
index ea74582..42e4fd3 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 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);
         }

services/autofill/java/com/android/server/autofill/AutoFillUI.java

diff --git a/services/autofill/java/com/android/server/autofill/AutoFillUI.java b/services/autofill/java/com/android/server/autofill/AutoFillUI.java
index 73f488d3..45fedd1 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.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 @@
 
     private final Context mContext;
     private final Session mSession;
-    private final IBinder mAppToken;
     private final WindowManager mWm;
 
     // Fill UI variables
@@ -77,10 +75,9 @@
      */
     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);
     }