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

Commit 761bff8d 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

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

Change-Id: I12d30709184ce343a87ef7dd4a164ca824b470d5
parents 072f70d5 2b5ab22b

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;

                    }

                }