From 8f60ea6360dace22e98eb9dfeead8118170fa401 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Wed, 1 Feb 2017 17:51:37 -0800 Subject: [PATCH] Pass token to AutoFillUI. Bug: 31001899, 34637800 Test: CTS Change-Id: If0d0a283aebd48db2694c3dcef5d3e077a9fa1f8 --- .../android/server/autofill/AutoFillManagerServiceImpl.java | 2 +- .../java/com/android/server/autofill/AutoFillUI.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutoFillManagerServiceImpl.java index 42e4fd3b2b7f9..ea74582ff62fd 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); + mUi = new AutoFillUI(mContext, this, activityToken); 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 76c291687ec3d..7d82bec4996c7 100644 --- a/services/autofill/java/com/android/server/autofill/AutoFillUI.java +++ b/services/autofill/java/com/android/server/autofill/AutoFillUI.java @@ -33,6 +33,7 @@ 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; @@ -63,6 +64,7 @@ final class AutoFillUI { private final Context mContext; private final Session mSession; + private final IBinder mAppToken; private final WindowManager mWm; // Fill UI variables @@ -77,9 +79,10 @@ final class AutoFillUI { */ private View mSnackbar; - AutoFillUI(Context context, Session session) { + AutoFillUI(Context context, Session session, IBinder appToken) { mContext = context; mSession = session; + mAppToken = appToken; mWm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); }