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

Commit d18fd804 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 3e78552e 6487eb5a
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -1351,7 +1351,7 @@ final class AutofillManagerServiceImpl
            Slog.v(TAG, "setAugmentedAutofillWhitelistLocked(packages=" + packages + ", activities="
            Slog.v(TAG, "setAugmentedAutofillWhitelistLocked(packages=" + packages + ", activities="
                    + activities + ")");
                    + activities + ")");
        }
        }
        whitelistForAugmentedAutofillPackages(packages, activities);
        allowlistForAugmentedAutofillPackages(packages, activities);
        final String serviceName;
        final String serviceName;
        if (mRemoteAugmentedAutofillServiceInfo != null) {
        if (mRemoteAugmentedAutofillServiceInfo != null) {
            serviceName = mRemoteAugmentedAutofillServiceInfo.getComponentName()
            serviceName = mRemoteAugmentedAutofillServiceInfo.getComponentName()
@@ -1415,7 +1415,7 @@ final class AutofillManagerServiceImpl
    /**
    /**
     * @throws IllegalArgumentException if packages or components are empty.
     * @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) {
            @Nullable List<ComponentName> components) {
        // TODO(b/123100824): add CTS test for when it's null
        // TODO(b/123100824): add CTS test for when it's null
        synchronized (mLock) {
        synchronized (mLock) {