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

Commit 8fbd3194 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: d18fd804 am: 908438e7

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



Change-Id: I675c206cd6cd344018f5fc15f46d80026a7f987a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69deaace 908438e7

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

+2 −2
Original line number Diff line number Diff line
@@ -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) {