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

Commit 4172f8a6 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Update language to comply with Android's inclusive language guidance 

See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: If75259aab72329f9f8b0e1972a96370ca5134e2c
parent a8cec413

services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java

+7 −7
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            Slog.i(TAG, "hasBindAppWidgetPermission() " + UserHandle.getCallingUserId());

        }



        // A special permission is required for managing white listing.

        // A special permission is required for managing allowlisting.

        mSecurityPolicy.enforceModifyAppWidgetBindPermissions(packageName);



        synchronized (mLock) {
@@ -1025,7 +1025,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
            Slog.i(TAG, "setBindAppWidgetPermission() " + UserHandle.getCallingUserId());

        }



        // A special permission is required for managing white listing.

        // A special permission is required for managing allowlisting.

        mSecurityPolicy.enforceModifyAppWidgetBindPermissions(packageName);



        synchronized (mLock) {
@@ -1117,7 +1117,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        }



        // If the provider is not under the calling user, make sure this

        // provider is white listed for access from the parent.

        // provider is allowlisted for access from the parent.

        if (!mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed(

                providerComponent.getPackageName(), providerProfileId)) {

            return false;
@@ -1126,7 +1126,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
        synchronized (mLock) {

            ensureGroupStateLoadedLocked(userId);



            // A special permission or white listing is required to bind widgets.

            // A special permission or allowlisting is required to bind widgets.

            if (!mSecurityPolicy.hasCallerBindPermissionOrBindWhiteListedLocked(

                    callingPackage)) {

                return false;
@@ -1741,7 +1741,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                    continue;

                }



                // Add providers only for the requested profile that are white-listed.

                // Add providers only for the requested profile that are allowlisted.

                final int providerProfileId = info.getProfile().getIdentifier();

                if (providerProfileId == profileId

                        && mSecurityPolicy.isProviderInCallerOrInProfileAndWhitelListed(
@@ -3576,7 +3576,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
    @Override

    public void onCrossProfileWidgetProvidersChanged(int userId, List<String> packages) {

        final int parentId = mSecurityPolicy.getProfileParent(userId);

        // We care only if the white-listed package is in a profile of

        // We care only if the allowlisted package is in a profile of

        // the group parent as only the parent can add widgets from the

        // profile and not the other way around.

        if (parentId != userId) {
@@ -3600,7 +3600,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku 
                            userId, null);

                }



                // Remove widgets from hosts in parent user for packages not in the whitelist

                // Remove widgets from hosts in parent user for packages not in the allowlist

                final int removedCount = previousPackages.size();

                for (int i = 0; i < removedCount; ++i) {

                    removeWidgetsForPackageLocked(previousPackages.valueAt(i),

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

+3 −3
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ final class AutofillManagerServiceImpl 
            @NonNull ComponentName componentName, boolean compatMode,

            boolean bindInstantServiceAllowed, int flags) {

        // FLAG_AUGMENTED_AUTOFILL_REQUEST is set in the flags when standard autofill is disabled

        // but the package is whitelisted for augmented autofill

        // but the package is allowlisted for augmented autofill

        boolean forAugmentedAutofillOnly = (flags

                & FLAG_ADD_CLIENT_ENABLED_FOR_AUGMENTED_AUTOFILL_ONLY) != 0;

        if (!isEnabledLocked() && !forAugmentedAutofillOnly) {
@@ -322,7 +322,7 @@ final class AutofillManagerServiceImpl 


        if (!forAugmentedAutofillOnly && isAutofillDisabledLocked(componentName)) {

            // Standard autofill is enabled, but service disabled autofill for this activity; that

            // means no session, unless the activity is whitelisted for augmented autofill

            // means no session, unless the activity is allowlisted for augmented autofill

            if (isWhitelistedForAugmentedAutofillLocked(componentName)) {

                if (sDebug) {

                    Slog.d(TAG, "startSession(" + componentName + "): disabled by service but "
@@ -1379,7 +1379,7 @@ final class AutofillManagerServiceImpl 
    }



    /**

     * Resets the augmented autofill whitelist.

     * Resets the augmented autofill allowlist.

     */

    @GuardedBy("mLock")

    void resetAugmentedAutofillWhitelistLocked() {

services/backup/backuplib/java/com/android/server/backup/TransportManager.java

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class TransportManager { 
        }

    }



    /** Returns a set with the whitelisted transports. */

    /** Returns a set with the allowlisted transports. */

    Set<ComponentName> getTransportWhitelist() {

        return mTransportWhitelist;

    }
@@ -590,7 +590,7 @@ public class TransportManager { 
        }

    }



    /** Transport has to be whitelisted and privileged. */

    /** Transport has to be allowlisted and privileged. */

    private boolean isTransportTrusted(ComponentName transport) {

        if (!mTransportWhitelist.contains(transport)) {

            Slog.w(

services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ public class TransportClient { 
                return;

            }

            // TODO (b/147705255): Remove when binder calls to IBackupTransport are not blocking

            // In short-term, blocking calls are OK as the transports come from the whitelist at

            // In short-term, blocking calls are OK as the transports come from the allowlist at

            // {@link SystemConfig#getBackupTransportWhitelist()}

            Binder.allowBlocking(binder);

            transportClient.onServiceConnected(binder);

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -885,11 +885,11 @@ public final class ContentCaptureManagerService extends 
            synchronized (mGlobalWhitelistStateLock) {

                packageWhitelisted = isWhitelisted(userId, packageName);

                if (!packageWhitelisted) {

                    // Full package is not whitelisted: check individual components first

                    // Full package is not allowlisted: check individual components first

                    whitelistedComponents = getWhitelistedComponents(userId, packageName);

                    if (whitelistedComponents == null

                            && packageName.equals(mServicePackages.get(userId))) {

                        // No components whitelisted either, but let it go because it's the

                        // No components allowlisted either, but let it go because it's the

                        // service's own package

                        if (verbose) Slog.v(TAG, "getOptionsForPackage() lite for " + packageName);

                        return new ContentCaptureOptions(mDevCfgLoggingLevel);
@@ -897,7 +897,7 @@ public final class ContentCaptureManagerService extends 
                }

            } // synchronized



            // Restrict what temporary services can whitelist

            // Restrict what temporary services can allowlist

            if (Build.IS_USER && mServiceNameResolver.isTemporary(userId)) {

                if (!packageName.equals(mServicePackages.get(userId))) {

                    Slog.w(TAG, "Ignoring package " + packageName + " while using temporary "