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

Commit e5aa5ebd authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed AutofillOptions.isAugmentedAutofillEnabled to use the right client. 

Also removed ContentCaptureClient, which is not used anymore (it probably became obsolete with the
ContentCaptureOptions optimization).

Fixes: 130585342
Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.augmented.AugmentedLoginNotImportantForAutofillActivityTest
Test: manual verification with Dialer app

Change-Id: I041922874fac749f1f5d49793f1ad3e26cc345d6
parent 5d230c14

core/java/android/app/Activity.java

+1 −14
Original line number Original line Diff line number Diff line
@@ -127,7 +127,6 @@ import android.view.autofill.AutofillPopupWindow; 
import android.view.autofill.IAutofillWindowPresenter;

import android.view.autofill.IAutofillWindowPresenter;

import android.view.contentcapture.ContentCaptureContext;

import android.view.contentcapture.ContentCaptureContext;

import android.view.contentcapture.ContentCaptureManager;

import android.view.contentcapture.ContentCaptureManager;

import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient;

import android.widget.AdapterView;

import android.widget.AdapterView;

import android.widget.Toast;

import android.widget.Toast;

import android.widget.Toolbar;

import android.widget.Toolbar;
@@ -724,7 +723,7 @@ public class Activity extends ContextThemeWrapper 
        Window.Callback, KeyEvent.Callback,

        Window.Callback, KeyEvent.Callback,

        OnCreateContextMenuListener, ComponentCallbacks2,

        OnCreateContextMenuListener, ComponentCallbacks2,

        Window.OnWindowDismissedCallback, WindowControllerCallback,

        Window.OnWindowDismissedCallback, WindowControllerCallback,

        AutofillManager.AutofillClient, ContentCaptureManager.ContentCaptureClient {

        AutofillManager.AutofillClient {

    private static final String TAG = "Activity";

    private static final String TAG = "Activity";

    private static final boolean DEBUG_LIFECYCLE = false;

    private static final boolean DEBUG_LIFECYCLE = false;
@@ -1124,12 +1123,6 @@ public class Activity extends ContextThemeWrapper 
        return this;

        return this;

    }

    }





    /** @hide */

    @Override

    public final ContentCaptureClient getContentCaptureClient() {

        return this;

    }



    /**

    /**

     * Register an {@link Application.ActivityLifecycleCallbacks} instance that receives

     * Register an {@link Application.ActivityLifecycleCallbacks} instance that receives

     * lifecycle callbacks for only this Activity.

     * lifecycle callbacks for only this Activity.
@@ -6509,12 +6502,6 @@ public class Activity extends ContextThemeWrapper 
        return getComponentName();

        return getComponentName();

    }

    }





    /** @hide */

    @Override

    public final ComponentName contentCaptureClientGetComponentName() {

        return getComponentName();

    }



    /**

    /**

     * Retrieve a {@link SharedPreferences} object for accessing preferences

     * Retrieve a {@link SharedPreferences} object for accessing preferences

     * that are private to this activity.  This simply calls the underlying

     * that are private to this activity.  This simply calls the underlying

core/java/android/content/AutofillOptions.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ import android.os.Parcelable; 
import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Log;

import android.util.Log;

import android.view.autofill.AutofillManager;

import android.view.autofill.AutofillManager;

import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient;

import android.view.autofill.AutofillManager.AutofillClient;





import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -73,10 +73,10 @@ public final class AutofillOptions implements Parcelable { 
    public boolean isAugmentedAutofillEnabled(@NonNull Context context) {

    public boolean isAugmentedAutofillEnabled(@NonNull Context context) {

        if (!augmentedAutofillEnabled) return false;

        if (!augmentedAutofillEnabled) return false;





        final ContentCaptureClient contentCaptureClient = context.getContentCaptureClient();

        final AutofillClient autofillClient = context.getAutofillClient();

        if (contentCaptureClient == null) return false;

        if (autofillClient == null) return false;





        final ComponentName component = contentCaptureClient.contentCaptureClientGetComponentName();

        final ComponentName component = autofillClient.autofillClientGetComponentName();

        return whitelistedActivitiesForAugmentedAutofill == null

        return whitelistedActivitiesForAugmentedAutofill == null

                || whitelistedActivitiesForAugmentedAutofill.contains(component);

                || whitelistedActivitiesForAugmentedAutofill.contains(component);

    }

    }

core/java/android/content/Context.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -70,7 +70,6 @@ import android.view.View; 
import android.view.ViewDebug;

import android.view.ViewDebug;

import android.view.WindowManager;

import android.view.WindowManager;

import android.view.autofill.AutofillManager.AutofillClient;

import android.view.autofill.AutofillManager.AutofillClient;

import android.view.contentcapture.ContentCaptureManager.ContentCaptureClient;

import android.view.textclassifier.TextClassificationManager;

import android.view.textclassifier.TextClassificationManager;





import java.io.File;

import java.io.File;
@@ -5411,14 +5410,6 @@ public abstract class Context { 
    public void setAutofillClient(@SuppressWarnings("unused") AutofillClient client) {

    public void setAutofillClient(@SuppressWarnings("unused") AutofillClient client) {

    }

    }





    /**

     * @hide

     */

    @Nullable

    public ContentCaptureClient getContentCaptureClient() {

        return null;

    }



    /**

    /**

     * @hide

     * @hide

     */

     */

core/java/android/view/contentcapture/ContentCaptureManager.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -342,15 +342,6 @@ public final class ContentCaptureManager { 
    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private MainContentCaptureSession mMainSession;

    private MainContentCaptureSession mMainSession;





    /** @hide */

    public interface ContentCaptureClient {

        /**

         * Gets the component name of the client.

         */

        @NonNull

        ComponentName contentCaptureClientGetComponentName();

    }



    /** @hide */

    /** @hide */

    public ContentCaptureManager(@NonNull Context context,

    public ContentCaptureManager(@NonNull Context context,

            @NonNull IContentCaptureManager service, @NonNull ContentCaptureOptions options) {

            @NonNull IContentCaptureManager service, @NonNull ContentCaptureOptions options) {