diff options
| author | 2023-08-22 20:00:36 +0000 | |
|---|---|---|
| committer | 2023-08-22 20:00:36 +0000 | |
| commit | 8fbd31941fec04e828c6cbc21aca038e62edff7a (patch) | |
| tree | e1d8e6b0c363867971be6b8eedddef7c517350dd | |
| parent | 69deaace0c935bbaf051f6ea67ac56808cb6c900 (diff) | |
| parent | 908438e7aca1cad4e7a6f687862fc723d2a4f440 (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" into main am: d18fd804b4 am: 908438e7ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2719959
Change-Id: I675c206cd6cd344018f5fc15f46d80026a7f987a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index 63a607c8d0d4..5b8bdd57ccbb 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -1413,7 +1413,7 @@ final class AutofillManagerServiceImpl Slog.v(TAG, "setAugmentedAutofillWhitelistLocked(packages=" + packages + ", activities=" + activities + ")"); } - whitelistForAugmentedAutofillPackages(packages, activities); + allowlistForAugmentedAutofillPackages(packages, activities); final String serviceName; if (mRemoteAugmentedAutofillServiceInfo != null) { serviceName = mRemoteAugmentedAutofillServiceInfo.getComponentName() @@ -1477,7 +1477,7 @@ final class AutofillManagerServiceImpl /** * @throws IllegalArgumentException if packages or components are empty. */ - private void whitelistForAugmentedAutofillPackages(@Nullable List<String> packages, + private void allowlistForAugmentedAutofillPackages(@Nullable List<String> packages, @Nullable List<ComponentName> components) { // TODO(b/123100824): add CTS test for when it's null synchronized (mLock) { |