diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2020-09-15 00:13:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-15 00:13:08 +0000 |
| commit | 487d3942962564b742db6ea5d944285a8d734301 (patch) | |
| tree | 93af79b8276ecce6054dee546a5a96ec1c4e68e1 /services/autofill | |
| parent | bc93881957cd39e810aa67bea67ffe6a67da9c2a (diff) | |
| parent | da7478b570ba291103a2b37ca33668f81adf87ad (diff) | |
Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195
Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
Diffstat (limited to 'services/autofill')
| -rw-r--r-- | services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index 57ffe0498a88..d59c955de889 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -313,7 +313,7 @@ final class AutofillManagerServiceImpl @NonNull ComponentName componentName, boolean compatMode, boolean bindInstantServiceAllowed, int flags) { // FLAG_AUGMENTED_AUTOFILL_REQUEST is set in the flags when standard autofill is disabled - // but the package is whitelisted for augmented autofill + // but the package is allowlisted for augmented autofill boolean forAugmentedAutofillOnly = (flags & FLAG_ADD_CLIENT_ENABLED_FOR_AUGMENTED_AUTOFILL_ONLY) != 0; if (!isEnabledLocked() && !forAugmentedAutofillOnly) { @@ -322,7 +322,7 @@ final class AutofillManagerServiceImpl if (!forAugmentedAutofillOnly && isAutofillDisabledLocked(componentName)) { // Standard autofill is enabled, but service disabled autofill for this activity; that - // means no session, unless the activity is whitelisted for augmented autofill + // means no session, unless the activity is allowlisted for augmented autofill if (isWhitelistedForAugmentedAutofillLocked(componentName)) { if (sDebug) { Slog.d(TAG, "startSession(" + componentName + "): disabled by service but " @@ -1379,7 +1379,7 @@ final class AutofillManagerServiceImpl } /** - * Resets the augmented autofill whitelist. + * Resets the augmented autofill allowlist. */ @GuardedBy("mLock") void resetAugmentedAutofillWhitelistLocked() { |