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

Commit 8795e50b 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 am: 8fbd3194 am: 129a7052 am: 75946f55

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



Change-Id: I02785f7cc08df204c23369cbdf9a405bb57b2e9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16cb0f57 75946f55

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) {