Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f60ea63 authored by Jason Long's avatar Jason Long
Browse files

Pass token to AutoFillUI. 

Bug: 31001899, 34637800
Test: CTS
Change-Id: If0d0a283aebd48db2694c3dcef5d3e077a9fa1f8
parent c54e1a60

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }

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

+4 −1
Original line number Diff line number Diff line
@@ -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);

    }