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

Commit 908438e7 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

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



Change-Id: I4ae6e48e2559a18c149a0c4a6a2c5be74da52fed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c322124 d18fd804

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

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