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

Commit 9856b19f authored by Felipe Leme's avatar Felipe Leme
Browse files

Allow datasets without presentation to optimize authentication use case. 

Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#testAutoFillDatasetWithoutFieldIsIgnored
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.DatasetTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 36547794

Change-Id: Ibf1d7e45dd2534b6990434db58bc4010f68433ec
parent ca6988e6

core/java/android/service/autofill/Dataset.java

+10 −5
Original line number Diff line number Diff line
@@ -280,19 +280,24 @@ public final class Dataset implements Parcelable { 
        /**

         * Sets the value of a field.

         *

         * <b>Note:</b> Prior to Android {@link android.os.Build.VERSION_CODES#P}, this method would

         * throw an {@link IllegalStateException} if this builder was constructed without a

         * {@link RemoteViews presentation}. Android {@link android.os.Build.VERSION_CODES#P} and

         * higher removed this restriction because datasets used as an

         * {@link android.view.autofill.AutofillManager#EXTRA_AUTHENTICATION_RESULT

         * authentication result} do not need a presentation. But if you don't set the presentation

         * in the constructor in a dataset that is meant to be shown to the user, the autofill UI

         * for this field will not be displayed.

         *

         * @param id id returned by {@link

         *         android.app.assist.AssistStructure.ViewNode#getAutofillId()}.

         * @param value value to be autofilled. Pass {@code null} if you do not have the value

         *        but the target view is a logical part of the dataset. For example, if

         *        the dataset needs authentication and you have no access to the value.

         * @return this builder.

         * @throws IllegalStateException if the builder was constructed without a

         * {@link RemoteViews presentation}.

         */

        public @NonNull Builder setValue(@NonNull AutofillId id, @Nullable AutofillValue value) {

            throwIfDestroyed();

            Preconditions.checkState(mPresentation != null,

                    "Dataset presentation not set on constructor");

            setLifeTheUniverseAndEverything(id, value, null, null);

            return this;

        }

services/autofill/java/com/android/server/autofill/ui/FillUi.java

+5 −0
Original line number Diff line number Diff line
@@ -157,6 +157,11 @@ final class FillUi { 
                final int index = dataset.getFieldIds().indexOf(focusedViewId);

                if (index >= 0) {

                    final RemoteViews presentation = dataset.getFieldPresentation(index);

                    if (presentation == null) {

                        Slog.w(TAG, "not displaying UI on field " + focusedViewId + " because "

                                + "service didn't provide a presentation for it on " + dataset);

                        continue;

                    }

                    final View view;

                    try {

                        if (sVerbose) Slog.v(TAG, "setting remote view for " + focusedViewId);