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

Commit 16e004be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Always let standard autofill try on new partitions even if session was... 

Merge "Always let standard autofill try on new partitions even if session was marked as augmented only." into sc-dev am: 2b5ab22b am: 761bff8d am: e5a89bf4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14970180

Change-Id: I009ec5f842fb8a367ea5d320915a897de81f5f7a
parents 691d97ef e5a89bf4

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

+12 −2
Original line number Diff line number Diff line
@@ -2725,6 +2725,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                Slog.d(TAG, "Starting partition or augmented request for view id " + id + ": "

                        + viewState.getStateAsString());

            }

            // Fix to always let standard autofill start.

            // Sometimes activity contain IMPORTANT_FOR_AUTOFILL_NO fields which marks session as

            // augmentedOnly, but other fields are still fillable by standard autofill.

            mSessionFlags.mAugmentedAutofillOnly = false;

            requestNewFillResponseLocked(viewState, ViewState.STATE_STARTED_PARTITION, flags);

            return true;

        }
@@ -2924,12 +2928,18 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
                            if (sDebug) Slog.d(TAG, "trigger augmented autofill.");

                            triggerAugmentedAutofillLocked(flags);

                        } else {

                            if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");

                            if (sDebug) {

                                Slog.d(TAG, "skip augmented autofill for same view: "

                                        + "same view entered");

                            }

                        }

                        return;

                    } else if (mSessionFlags.mAugmentedAutofillOnly && isSameViewEntered) {

                        // Regular autofill is disabled.

                        if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");

                        if (sDebug) {

                            Slog.d(TAG, "skip augmented autofill for same view: "

                                    + "standard autofill disabled.");

                        }

                        return;

                    }

                }