Merge "Always let standard autofill try on new partitions even if session was... (2b5ab22b) · Commits · e / os / android_frameworks_base

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -2648,6 +2648,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;
		}
		@@ -2847,12 +2851,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;
		}
		}