diff options
| author | 2020-09-11 14:17:03 -0600 | |
|---|---|---|
| committer | 2020-09-14 09:59:01 -0600 | |
| commit | 705f6bec2d4506936c7fe0d114e377b74d0bfd70 (patch) | |
| tree | a47af99c923f177ee7916cb7e9522eaadac51ff0 | |
| parent | 70b20ee0b885e250adba8cfea36fa06e6d8b073b (diff) | |
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: I53003332717baf57dc088b2f6b969cdb1863f65e
46 files changed, 144 insertions, 144 deletions
diff --git a/core/java/android/accounts/ChooseTypeAndAccountActivity.java b/core/java/android/accounts/ChooseTypeAndAccountActivity.java index 57c108326706..4b4ef002ae06 100644 --- a/core/java/android/accounts/ChooseTypeAndAccountActivity.java +++ b/core/java/android/accounts/ChooseTypeAndAccountActivity.java @@ -572,7 +572,7 @@ public class ChooseTypeAndAccountActivity extends Activity } /** - * Returns a set of whitelisted accounts given by the intent or null if none specified by the + * Returns a set of allowlisted accounts given by the intent or null if none specified by the * intent. */ private Set<Account> getAllowableAccountSet(final Intent intent) { diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 63e8638a34a4..8ddca15a9959 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -8348,7 +8348,7 @@ public class Activity extends ContextThemeWrapper * * <p>If {@link DevicePolicyManager#isLockTaskPermitted(String)} returns {@code true} * for this component, the current task will be launched directly into LockTask mode. Only apps - * whitelisted by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])} can + * allowlisted by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])} can * be launched while LockTask mode is active. The user will not be able to leave this mode * until this activity calls {@link #stopLockTask()}. Calling this method while the device is * already in LockTask mode has no effect. @@ -8380,7 +8380,7 @@ public class Activity extends ContextThemeWrapper * <p><strong>Note:</strong> If the device is in LockTask mode that is not initially started * by this activity, then calling this method will not terminate the LockTask mode, but only * finish its own task. The device will remain in LockTask mode, until the activity which - * started the LockTask mode calls this method, or until its whitelist authorization is revoked + * started the LockTask mode calls this method, or until its allowlist authorization is revoked * by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])}. * * @see #startLockTask() diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 1059a6f2e868..0e811a4a4e73 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -4875,9 +4875,9 @@ public class ActivityManager { } /** - * Get packages of bugreport-whitelisted apps to handle a bug report. + * Get packages of bugreport-allowlisted apps to handle a bug report. * - * @return packages of bugreport-whitelisted apps to handle a bug report. + * @return packages of bugreport-allowlisted apps to handle a bug report. * @hide */ public List<String> getBugreportWhitelistedPackages() { diff --git a/core/java/android/app/BroadcastOptions.java b/core/java/android/app/BroadcastOptions.java index 161e2ad06ec0..3789a44e1d55 100644 --- a/core/java/android/app/BroadcastOptions.java +++ b/core/java/android/app/BroadcastOptions.java @@ -36,7 +36,7 @@ public class BroadcastOptions { private boolean mAllowBackgroundActivityStarts; /** - * How long to temporarily put an app on the power whitelist when executing this broadcast + * How long to temporarily put an app on the power allowlist when executing this broadcast * to it. */ static final String KEY_TEMPORARY_APP_WHITELIST_DURATION @@ -87,8 +87,8 @@ public class BroadcastOptions { /** * Set a duration for which the system should temporary place an application on the - * power whitelist when this broadcast is being delivered to it. - * @param duration The duration in milliseconds; 0 means to not place on whitelist. + * power allowlist when this broadcast is being delivered to it. + * @param duration The duration in milliseconds; 0 means to not place on allowlist. */ @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST) public void setTemporaryAppWhitelistDuration(long duration) { diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 79d2a8102358..6df48a7fe1a5 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -953,7 +953,7 @@ public class Notification implements Parcelable public ArraySet<PendingIntent> allPendingIntents; /** - * Token identifying the notification that is applying doze/bgcheck whitelisting to the + * Token identifying the notification that is applying doze/bgcheck allowlisting to the * pending intents inside of it, so only those will get the behavior. * * @hide diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java index 58068769e63a..df4e8b8137b7 100644 --- a/core/java/android/app/PropertyInvalidatedCache.java +++ b/core/java/android/app/PropertyInvalidatedCache.java @@ -168,8 +168,8 @@ import java.util.concurrent.atomic.AtomicLong; * this local case, there's no IPC, so use of the cache is (depending on exact * circumstance) unnecessary. * - * For security, there is a whitelist of processes that are allowed to invalidate a cache. - * The whitelist includes normal runtime processes but does not include test processes. + * For security, there is a allowlist of processes that are allowed to invalidate a cache. + * The allowlist includes normal runtime processes but does not include test processes. * Test processes must call {@code PropertyInvalidatedCache.disableForTestMode()} to disable * all cache activity in that process. * diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index e599a5ce81ef..e9683a4fdd77 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -1123,7 +1123,7 @@ public final class SystemServiceRegistry { // Get the services without throwing as this is an optional feature Context outerContext = ctx.getOuterContext(); ContentCaptureOptions options = outerContext.getContentCaptureOptions(); - // Options is null when the service didn't whitelist the activity or package + // Options is null when the service didn't allowlist the activity or package if (options != null && (options.lite || options.isWhitelisted(outerContext))) { IBinder b = ServiceManager .getService(Context.CONTENT_CAPTURE_MANAGER_SERVICE); @@ -1133,7 +1133,7 @@ public final class SystemServiceRegistry { return new ContentCaptureManager(outerContext, service, options); } } - // When feature is disabled or app / package not whitelisted, we return a null + // When feature is disabled or app / package not allowlisted, we return a null // manager to apps so the performance impact is practically zero return null; }}); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 322cac81d58b..70358d5a21c0 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2051,7 +2051,7 @@ public class DevicePolicyManager { * Enable the Home button during LockTask mode. Note that if a custom launcher is used, it has * to be registered as the default launcher with * {@link #addPersistentPreferredActivity(ComponentName, IntentFilter, ComponentName)}, and its - * package needs to be whitelisted for LockTask with + * package needs to be allowlisted for LockTask with * {@link #setLockTaskPackages(ComponentName, String[])}. * * @see #setLockTaskFeatures(ComponentName, int) @@ -2092,7 +2092,7 @@ public class DevicePolicyManager { public static final int LOCK_TASK_FEATURE_KEYGUARD = 1 << 5; /** - * Enable blocking of non-whitelisted activities from being started into a locked task. + * Enable blocking of non-allowlisted activities from being started into a locked task. * * @see #setLockTaskFeatures(ComponentName, int) */ @@ -4713,7 +4713,7 @@ public class DevicePolicyManager { /** * Disable trust agents on secure keyguard screens (e.g. PIN/Pattern/Password). * By setting this flag alone, all trust agents are disabled. If the admin then wants to - * whitelist specific features of some trust agent, {@link #setTrustAgentConfiguration} can be + * allowlist specific features of some trust agent, {@link #setTrustAgentConfiguration} can be * used in conjuction to set trust-agent-specific configurations. */ public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 1 << 4; @@ -5694,7 +5694,7 @@ public class DevicePolicyManager { * The call will fail if called with the package name of an unsupported VPN app. * <p> Enabling lockdown via {@code lockdownEnabled} argument carries the risk that any failure * of the VPN provider could break networking for all apps. This method clears any lockdown - * whitelist set by {@link #setAlwaysOnVpnPackage(ComponentName, String, boolean, Set)}. + * allowlist set by {@link #setAlwaysOnVpnPackage(ComponentName, String, boolean, Set)}. * * @param vpnPackage The package name for an installed VPN app on the device, or {@code null} to * remove an existing always-on VPN configuration. @@ -5716,13 +5716,13 @@ public class DevicePolicyManager { * admin to specify a set of apps that should be able to access the network directly when VPN * is not connected. When VPN connects these apps switch over to VPN if allowed to use that VPN. * System apps can always bypass VPN. - * <p> Note that the system doesn't update the whitelist when packages are installed or + * <p> Note that the system doesn't update the allowlist when packages are installed or * uninstalled, the admin app must call this method to keep the list up to date. * <p> When {@code lockdownEnabled} is false {@code lockdownWhitelist} is ignored . When * {@code lockdownEnabled} is {@code true} and {@code lockdownWhitelist} is {@code null} or * empty, only system apps can bypass VPN. * <p> Setting always-on VPN package to {@code null} or using - * {@link #setAlwaysOnVpnPackage(ComponentName, String, boolean)} clears lockdown whitelist. + * {@link #setAlwaysOnVpnPackage(ComponentName, String, boolean)} clears lockdown allowlist. * * @param vpnPackage package name for an installed VPN app on the device, or {@code null} * to remove an existing always-on VPN configuration @@ -7966,7 +7966,7 @@ public class DevicePolicyManager { * {@link #setApplicationHidden(ComponentName, String, boolean)}) * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @param packageList List of package names to whitelist + * @param packageList List of package names to allowlist * @return true if setting the restriction succeeded. It will fail if called outside a managed * profile * @throws SecurityException if {@code admin} is not a profile owner. @@ -9259,14 +9259,14 @@ public class DevicePolicyManager { /** * Called by the profile owner of a managed profile to enable widget providers from a given * package to be available in the parent profile. As a result the user will be able to add - * widgets from the white-listed package running under the profile to a widget host which runs + * widgets from the allowlisted package running under the profile to a widget host which runs * under the parent profile, for example the home screen. Note that a package may have zero or * more provider components, where each component provides a different widget type. * <p> - * <strong>Note:</strong> By default no widget provider package is white-listed. + * <strong>Note:</strong> By default no widget provider package is allowlisted. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @param packageName The package from which widget providers are white-listed. + * @param packageName The package from which widget providers are allowlisted. * @return Whether the package was added. * @throws SecurityException if {@code admin} is not a profile owner. * @see #removeCrossProfileWidgetProvider(android.content.ComponentName, String) @@ -9290,10 +9290,10 @@ public class DevicePolicyManager { * should have been added via * {@link #addCrossProfileWidgetProvider( android.content.ComponentName, String)}. * <p> - * <strong>Note:</strong> By default no widget provider package is white-listed. + * <strong>Note:</strong> By default no widget provider package is allowlisted. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @param packageName The package from which widget providers are no longer white-listed. + * @param packageName The package from which widget providers are no longer allowlisted. * @return Whether the package was removed. * @throws SecurityException if {@code admin} is not a profile owner. * @see #addCrossProfileWidgetProvider(android.content.ComponentName, String) @@ -9317,7 +9317,7 @@ public class DevicePolicyManager { * available in the parent profile. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. - * @return The white-listed package list. + * @return The allowlisted package list. * @see #addCrossProfileWidgetProvider(android.content.ComponentName, String) * @see #removeCrossProfileWidgetProvider(android.content.ComponentName, String) * @throws SecurityException if {@code admin} is not a profile owner. @@ -11641,7 +11641,7 @@ public class DevicePolicyManager { * called, no package is allowed to access cross-profile calendar APIs by default. * * @param admin which {@link DeviceAdminReceiver} this request is associated with - * @param packageNames set of packages to be whitelisted + * @param packageNames set of packages to be allowlisted * @throws SecurityException if {@code admin} is not a profile owner * * @see #getCrossProfileCalendarPackages(ComponentName) @@ -11748,7 +11748,7 @@ public class DevicePolicyManager { } /** - * Sets the set of admin-whitelisted package names that are allowed to request user consent for + * Sets the set of admin-allowlisted package names that are allowed to request user consent for * cross-profile communication. * * <p>Assumes that the caller is a profile owner and is the given {@code admin}. @@ -11756,11 +11756,11 @@ public class DevicePolicyManager { * <p>Previous calls are overridden by each subsequent call to this method. * * <p>Note that other apps may be able to request user consent for cross-profile communication - * if they have been explicitly whitelisted by the OEM. + * if they have been explicitly allowlisted by the OEM. * * <p>When previously-set cross-profile packages are missing from {@code packageNames}, the * app-op for {@code INTERACT_ACROSS_PROFILES} will be reset for those packages. This will not - * occur for packages that are whitelisted by the OEM. + * occur for packages that are allowlisted by the OEM. * * @param admin the {@link DeviceAdminReceiver} this request is associated with * @param packageNames the new cross-profile package names @@ -11785,7 +11785,7 @@ public class DevicePolicyManager { * <p>Assumes that the caller is a profile owner and is the given {@code admin}. * * <p>Note that other apps not included in the returned set may be able to request user consent - * for cross-profile communication if they have been explicitly whitelisted by the OEM. + * for cross-profile communication if they have been explicitly allowlisted by the OEM. * * @param admin the {@link DeviceAdminReceiver} this request is associated with * @return the set of package names the admin has previously set as allowed to request user @@ -11816,7 +11816,7 @@ public class DevicePolicyManager { * #vendor_cross_profile_apps}.</li> * </ul> * - * @return the combined set of whitelisted package names set via + * @return the combined set of allowlisted package names set via * {@link #setCrossProfilePackages(ComponentName, Set)}, {@link com.android.internal.R.array * #cross_profile_apps}, and {@link com.android.internal.R.array#vendor_cross_profile_apps}. * diff --git a/core/java/android/app/admin/DevicePolicyManagerInternal.java b/core/java/android/app/admin/DevicePolicyManagerInternal.java index 8f5dbc45bf1b..19242ba9bdb5 100644 --- a/core/java/android/app/admin/DevicePolicyManagerInternal.java +++ b/core/java/android/app/admin/DevicePolicyManagerInternal.java @@ -36,36 +36,36 @@ import java.util.Set; public abstract class DevicePolicyManagerInternal { /** - * Listener for changes in the white-listed packages to show cross-profile + * Listener for changes in the allowlisted packages to show cross-profile * widgets. */ public interface OnCrossProfileWidgetProvidersChangeListener { /** - * Called when the white-listed packages to show cross-profile widgets + * Called when the allowlisted packages to show cross-profile widgets * have changed for a given user. * - * @param profileId The profile for which the white-listed packages changed. - * @param packages The white-listed packages. + * @param profileId The profile for which the allowlisted packages changed. + * @param packages The allowlisted packages. */ public void onCrossProfileWidgetProvidersChanged(int profileId, List<String> packages); } /** - * Gets the packages whose widget providers are white-listed to be + * Gets the packages whose widget providers are allowlisted to be * available in the parent user. * * <p>This takes the DPMS lock. DO NOT call from PM/UM/AM with their lock held. * * @param profileId The profile id. * @return The list of packages if such or empty list if there are - * no white-listed packages or the profile id is not a managed + * no allowlisted packages or the profile id is not a managed * profile. */ public abstract List<String> getCrossProfileWidgetProviders(int profileId); /** - * Adds a listener for changes in the white-listed packages to show + * Adds a listener for changes in the allowlisted packages to show * cross-profile app widgets. * * <p>This takes the DPMS lock. DO NOT call from PM/UM/AM with their lock held. @@ -181,7 +181,7 @@ public abstract class DevicePolicyManagerInternal { * {@link com.android.internal.R.array#vendor_cross_profile_apps}.</li> * </ul> * - * @return the combined set of whitelisted package names set via + * @return the combined set of allowlisted package names set via * {@link DevicePolicyManager#setCrossProfilePackages(ComponentName, Set)} and * {@link com.android.internal.R.array#cross_profile_apps} and * {@link com.android.internal.R.array#vendor_cross_profile_apps} diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index 1345e66a355a..f74d16ee9238 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -1186,13 +1186,13 @@ public final class UsageStatsManager { /** * {@hide} - * Temporarily whitelist the specified app for a short duration. This is to allow an app + * Temporarily allowlist the specified app for a short duration. This is to allow an app * receiving a high priority message to be able to access the network and acquire wakelocks * even if the device is in power-save mode or the app is currently considered inactive. - * @param packageName The package name of the app to whitelist. - * @param duration Duration to whitelist the app for, in milliseconds. It is recommended that + * @param packageName The package name of the app to allowlist. + * @param duration Duration to allowlist the app for, in milliseconds. It is recommended that * this be limited to 10s of seconds. Requested duration will be clamped to a few minutes. - * @param user The user for whom the package should be whitelisted. Passing in a user that is + * @param user The user for whom the package should be allowlisted. Passing in a user that is * not the same as the caller's process will require the INTERACT_ACROSS_USERS permission. * @see #isAppInactive(String) * diff --git a/core/java/android/content/AutofillOptions.java b/core/java/android/content/AutofillOptions.java index 97b33b74314c..80a7b16ee761 100644 --- a/core/java/android/content/AutofillOptions.java +++ b/core/java/android/content/AutofillOptions.java @@ -54,12 +54,12 @@ public final class AutofillOptions implements Parcelable { public final boolean compatModeEnabled; /** - * Whether package is whitelisted for augmented autofill. + * Whether package is allowlisted for augmented autofill. */ public boolean augmentedAutofillEnabled; /** - * List of whitelisted activities. + * List of allowlisted activities. */ @Nullable public ArraySet<ComponentName> whitelistedActivitiesForAugmentedAutofill; @@ -82,7 +82,7 @@ public final class AutofillOptions implements Parcelable { } /** - * Returns whether activity is whitelisted for augmented autofill. + * Returns whether activity is allowlisted for augmented autofill. */ public boolean isAugmentedAutofillEnabled(@NonNull Context context) { if (!augmentedAutofillEnabled) return false; diff --git a/core/java/android/content/ContentCaptureOptions.java b/core/java/android/content/ContentCaptureOptions.java index cb2142c356b2..ef49e029db13 100644 --- a/core/java/android/content/ContentCaptureOptions.java +++ b/core/java/android/content/ContentCaptureOptions.java @@ -69,7 +69,7 @@ public final class ContentCaptureOptions implements Parcelable { public final int logHistorySize; /** - * List of activities explicitly whitelisted for content capture (or {@code null} if whitelisted + * List of activities explicitly allowlisted for content capture (or {@code null} if allowlisted * for all acitivites in the package). */ @Nullable @@ -147,7 +147,7 @@ public final class ContentCaptureOptions implements Parcelable { /** @hide */ @VisibleForTesting public boolean isWhitelisted(@NonNull Context context) { - if (whitelistedComponents == null) return true; // whole package is whitelisted + if (whitelistedComponents == null) return true; // whole package is allowlisted final ContentCaptureClient client = context.getContentCaptureClient(); if (client == null) { // Shouldn't happen, but it doesn't hurt to check... diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 8472144a92cf..153e0a23b45a 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -6080,7 +6080,7 @@ public abstract class Context { } /** - * Gets the Content Capture options for this context, or {@code null} if it's not whitelisted. + * Gets the Content Capture options for this context, or {@code null} if it's not allowlisted. * * @hide */ diff --git a/core/java/android/content/RestrictionEntry.java b/core/java/android/content/RestrictionEntry.java index 010992c98d48..8f08fdec7806 100644 --- a/core/java/android/content/RestrictionEntry.java +++ b/core/java/android/content/RestrictionEntry.java @@ -68,7 +68,7 @@ public class RestrictionEntry implements Parcelable { /** * Restriction of type "multi-select". Use this for presenting a multi-select list where more - * than one entry can be selected, such as for choosing specific titles to white-list. + * than one entry can be selected, such as for choosing specific titles to allowlist. * Call {@link #setChoiceEntries(String[])} and * {@link #setChoiceValues(String[])} to set the localized list entries to present to the user * and the corresponding values, respectively. diff --git a/core/java/android/content/integrity/AppIntegrityManager.java b/core/java/android/content/integrity/AppIntegrityManager.java index 2869abb53b37..4db4c7316433 100644 --- a/core/java/android/content/integrity/AppIntegrityManager.java +++ b/core/java/android/content/integrity/AppIntegrityManager.java @@ -31,7 +31,7 @@ import java.util.List; * Class for pushing rules used to check the integrity of app installs. * * <p>Note: applications using methods of this class must be a system app and have their package - * name whitelisted as an integrity rule provider. Otherwise a {@link SecurityException} will be + * name allowlisted as an integrity rule provider. Otherwise a {@link SecurityException} will be * thrown. * * @hide @@ -125,7 +125,7 @@ public class AppIntegrityManager { } /** - * Get the package names of all whitelisted rule providers. + * Get the package names of all allowlisted rule providers. * * <p>Warning: this method is only used for tests. * diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 043953d1aabd..2a78eb97513e 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -2007,7 +2007,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * Updates the hidden API enforcement policy for this app from the given values, if appropriate. * * This will have no effect if this app is not subject to hidden API enforcement, i.e. if it - * is on the package whitelist. + * is on the package allowlist. * * @param policy configured policy for this app, or {@link #HIDDEN_API_ENFORCEMENT_DEFAULT} * if nothing configured. diff --git a/core/java/android/content/pm/CrossProfileApps.java b/core/java/android/content/pm/CrossProfileApps.java index 3b6740ef7343..8b411d5fe031 100644 --- a/core/java/android/content/pm/CrossProfileApps.java +++ b/core/java/android/content/pm/CrossProfileApps.java @@ -285,7 +285,7 @@ public class CrossProfileApps { * </ul> * * <p>Note that in order for the user to be able to grant the consent, the requesting package - * must be whitelisted by the admin or the OEM and installed in the other profile. If this is + * must be allowlisted by the admin or the OEM and installed in the other profile. If this is * not the case the user will be shown a message explaining why they can't grant the consent. * * <p>Note that user consent could already be granted if given a return value of {@code true}. @@ -310,8 +310,8 @@ public class CrossProfileApps { * <li>{@link #getTargetUserProfiles()} returns a non-empty list for the calling user.</li> * <li>The user has previously consented to cross-profile communication for the calling * package.</li> - * <li>The calling package has either been whitelisted by default by the OEM or has been - * explicitly whitelisted by the admin via + * <li>The calling package has either been allowlisted by default by the OEM or has been + * explicitly allowlisted by the admin via * {@link android.app.admin.DevicePolicyManager#setCrossProfilePackages(ComponentName, Set)}. * </li> * </ul> @@ -430,10 +430,10 @@ public class CrossProfileApps { * other profile in the same profile group. * * <p>This differs from {@link #canConfigureInteractAcrossProfiles(String)} since it will - * not return {@code false} if the app is not whitelisted or not installed in the other profile. + * not return {@code false} if the app is not allowlisted or not installed in the other profile. * * <p>Note that platform-signed apps that are automatically granted the permission and are not - * whitelisted by the OEM will not be included in this list. + * allowlisted by the OEM will not be included in this list. * * @hide */ diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java index fc4ccd072e75..80ba7b1953ad 100644 --- a/core/java/android/content/pm/PackageInstaller.java +++ b/core/java/android/content/pm/PackageInstaller.java @@ -697,7 +697,7 @@ public class PackageInstaller { * installer was created. * * <p>This will - * {@link PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set) whitelist + * {@link PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set) allowlist * all restricted permissions}. * * @param packageName The package to install. @@ -1701,25 +1701,25 @@ public class PackageInstaller { } /** - * Sets which restricted permissions to be whitelisted for the app. Whitelisting + * Sets which restricted permissions to be allowlisted for the app. Allowlisting * is not granting the permissions, rather it allows the app to hold permissions - * which are otherwise restricted. Whitelisting a non restricted permission has + * which are otherwise restricted. Allowlisting a non restricted permission has * no effect. * * <p> Permissions can be hard restricted which means that the app cannot hold * them or soft restricted where the app can hold the permission but in a weaker * form. Whether a permission is {@link PermissionInfo#FLAG_HARD_RESTRICTED hard * restricted} or {@link PermissionInfo#FLAG_SOFT_RESTRICTED soft restricted} - * depends on the permission declaration. Whitelisting a hard restricted permission - * allows the app to hold that permission and whitelisting a soft restricted + * depends on the permission declaration. Allowlisting a hard restricted permission + * allows the app to hold that permission and allowlisting a soft restricted * permission allows the app to hold the permission in its full, unrestricted form. * - * <p> Permissions can also be immutably restricted which means that the whitelist + * <p> Permissions can also be immutably restricted which means that the allowlist * state of the permission can be determined only at install time and cannot be * changed on updated or at a later point via the package manager APIs. * - * <p>Initially, all restricted permissions are whitelisted but you can change - * which ones are whitelisted by calling this method or the corresponding ones + * <p>Initially, all restricted permissions are allowlisted but you can change + * which ones are allowlisted by calling this method or the corresponding ones * on the {@link PackageManager}. Only soft or hard restricted permissions on the current * Android version are supported and any invalid entries will be removed. * @@ -2426,7 +2426,7 @@ public class PackageInstaller { /** * Get the value set in {@link SessionParams#setWhitelistedRestrictedPermissions(Set)}. - * Note that if all permissions are whitelisted this method returns {@link + * Note that if all permissions are allowlisted this method returns {@link * SessionParams#RESTRICTED_PERMISSIONS_ALL}. * * @hide diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 5f6befdcbaef..652d24108a19 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -371,7 +371,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { * * <p>This permission is restricted immutably which means that its * restriction state may be specified only on the first install of - * the app and will stay in this initial whitelist state until + * the app and will stay in this initial allowlist state until * the app is uninstalled. */ public static final int FLAG_IMMUTABLY_RESTRICTED = 1<<4; diff --git a/core/java/android/hardware/biometrics/BiometricAuthenticator.java b/core/java/android/hardware/biometrics/BiometricAuthenticator.java index 11cf2d698730..b3d74f783e16 100644 --- a/core/java/android/hardware/biometrics/BiometricAuthenticator.java +++ b/core/java/android/hardware/biometrics/BiometricAuthenticator.java @@ -32,7 +32,7 @@ public interface BiometricAuthenticator { /** * No biometric methods or nothing has been enrolled. - * Move/expose these in BiometricPrompt if we ever want to allow applications to "blacklist" + * Move/expose these in BiometricPrompt if we ever want to allow applications to "denylist" * modalities when calling authenticate(). * @hide */ diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index 1922b6df2e7f..e9e242e2b08a 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -84,7 +84,7 @@ public class NetworkPolicyManager { * The RULE_xxx_ALL rules applies to all networks (metered or non-metered), but on * metered networks, the RULE_xxx_METERED rules should be checked first. For example, * if the device is on Battery Saver Mode and Data Saver Mode simulatenously, and a uid - * is whitelisted for the former but not the latter, its status would be + * is allowlisted for the former but not the latter, its status would be * RULE_REJECT_METERED | RULE_ALLOW_ALL, meaning it could have access to non-metered * networks but not to metered networks. * diff --git a/core/java/android/net/apf/ApfCapabilities.java b/core/java/android/net/apf/ApfCapabilities.java index b1de74e817bc..92c543294ae1 100644 --- a/core/java/android/net/apf/ApfCapabilities.java +++ b/core/java/android/net/apf/ApfCapabilities.java @@ -127,7 +127,7 @@ public final class ApfCapabilities implements Parcelable { } /** - * @return An array of blacklisted EtherType, packets with EtherTypes within it will be dropped. + * @return An array of denylisted EtherType, packets with EtherTypes within it will be dropped. */ public static @NonNull int[] getApfEtherTypeBlackList() { return Resources.getSystem().getIntArray(R.array.config_apfEthTypeBlackList); diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index fbe6a5052f3d..48d3267f5fec 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -1776,7 +1776,7 @@ public abstract class BatteryStats implements Parcelable { public static final int EVENT_PACKAGE_INACTIVE = 0x000f; // Event for a package becoming active due to an interaction. public static final int EVENT_PACKAGE_ACTIVE = 0x0010; - // Event for a package being on the temporary whitelist. + // Event for a package being on the temporary allowlist. public static final int EVENT_TEMP_WHITELIST = 0x0011; // Event for the screen waking up. public static final int EVENT_SCREEN_WAKE_UP = 0x0012; diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index be2de0edda2d..f3e3ff96cdcf 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1795,8 +1795,8 @@ public final class PowerManager { } /** - * Return whether the given application package name is on the device's power whitelist. - * Apps can be placed on the whitelist through the settings UI invoked by + * Return whether the given application package name is on the device's power allowlist. + * Apps can be placed on the allowlist through the settings UI invoked by * {@link android.provider.Settings#ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS}. */ public boolean isIgnoringBatteryOptimizations(String packageName) { @@ -2219,7 +2219,7 @@ public final class PowerManager { = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED"; /** - * @hide Intent that is broadcast when the set of power save whitelist apps has changed. + * @hide Intent that is broadcast when the set of power save allowlist apps has changed. * This broadcast is only sent to registered receivers. */ @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION) @@ -2227,7 +2227,7 @@ public final class PowerManager { = "android.os.action.POWER_SAVE_WHITELIST_CHANGED"; /** - * @hide Intent that is broadcast when the set of temporarily whitelisted apps has changed. + * @hide Intent that is broadcast when the set of temporarily allowlisted apps has changed. * This broadcast is only sent to registered receivers. */ @SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION) diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index a4077fbee892..52dd86554e91 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -614,7 +614,7 @@ public class Process { * started. * @param pkgDataInfoMap Map from related package names to private data directory * volume UUID and inode number. - * @param whitelistedDataInfoMap Map from whitelisted package names to private data directory + * @param whitelistedDataInfoMap Map from allowlisted package names to private data directory * volume UUID and inode number. * @param bindMountAppsData whether zygote needs to mount CE and DE data. * @param bindMountAppStorageDirs whether zygote needs to mount Android/obb and Android/data. diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index e39e22ee632c..77e724beb712 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -333,7 +333,7 @@ public class ZygoteProcess { * started. * @param pkgDataInfoMap Map from related package names to private data directory * volume UUID and inode number. - * @param whitelistedDataInfoMap Map from whitelisted package names to private data directory + * @param whitelistedDataInfoMap Map from allowlisted package names to private data directory * volume UUID and inode number. * @param bindMountAppsData whether zygote needs to mount CE and DE data. * @param bindMountAppStorageDirs whether zygote needs to mount Android/obb and Android/data. @@ -615,7 +615,7 @@ public class ZygoteProcess { * @param disabledCompatChanges a list of disabled compat changes for the process being started. * @param pkgDataInfoMap Map from related package names to private data directory volume UUID * and inode number. - * @param whitelistedDataInfoMap Map from whitelisted package names to private data directory + * @param whitelistedDataInfoMap Map from allowlisted package names to private data directory * volume UUID and inode number. * @param bindMountAppsData whether zygote needs to mount CE and DE data. * @param bindMountAppStorageDirs whether zygote needs to mount Android/obb and Android/data. diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java index 17fae1cafe62..e1aa21e8ea49 100644 --- a/core/java/android/provider/CalendarContract.java +++ b/core/java/android/provider/CalendarContract.java @@ -188,7 +188,7 @@ public final class CalendarContract { * notified when there is a change in the managed profile calendar provider. * * <p>Throw UnsupportedOperationException if another profile doesn't exist or is disabled, or - * if the calling package is not whitelisted to access cross-profile calendar, or if the + * if the calling package is not allowlisted to access cross-profile calendar, or if the * feature has been disabled by the user in Settings. * * @see Events#ENTERPRISE_CONTENT_URI diff --git a/core/java/android/service/autofill/FillResponse.java b/core/java/android/service/autofill/FillResponse.java index bc08b84d31fd..b1107a8c2efb 100644 --- a/core/java/android/service/autofill/FillResponse.java +++ b/core/java/android/service/autofill/FillResponse.java @@ -501,7 +501,7 @@ public final class FillResponse implements Parcelable { * Disables autofill for the app or activity. * * <p>This method is useful to optimize performance in cases where the service knows it - * can not autofill an app—for example, when the service has a list of "blacklisted" + * can not autofill an app—for example, when the service has a list of "denylisted" * apps such as office suites. * * <p>By default, it disables autofill for all activities in the app, unless the response is diff --git a/core/java/android/service/autofill/augmented/AugmentedAutofillService.java b/core/java/android/service/autofill/augmented/AugmentedAutofillService.java index 95cc64ae8aab..620c457024b8 100644 --- a/core/java/android/service/autofill/augmented/AugmentedAutofillService.java +++ b/core/java/android/service/autofill/augmented/AugmentedAutofillService.java @@ -204,7 +204,7 @@ public abstract class AugmentedAutofillService extends Service { * <ul> * <li>Service does not recognize what should be autofilled. * <li>Service does not have data to fill the request. - * <li>Service blacklisted that app (or activity) for autofill. + * <li>Service denylisted that app (or activity) for autofill. * <li>App disabled itself for autofill. * </ul> * diff --git a/core/java/android/service/contentcapture/ContentCaptureService.java b/core/java/android/service/contentcapture/ContentCaptureService.java index b1f147be6735..84f602820f4a 100644 --- a/core/java/android/service/contentcapture/ContentCaptureService.java +++ b/core/java/android/service/contentcapture/ContentCaptureService.java @@ -231,7 +231,7 @@ public abstract class ContentCaptureService extends Service { /** * Explicitly limits content capture to the given packages and activities. * - * <p>To reset the whitelist, call it passing {@code null} to both arguments. + * <p>To reset the allowlist, call it passing {@code null} to both arguments. * * <p>Useful when the service wants to restrict content capture to a category of apps, like * chat apps. For example, if the service wants to support view captures on all activities of @@ -367,7 +367,7 @@ public abstract class ContentCaptureService extends Service { * Notifies the service of an activity-level event that is not associated with a session. * * <p>This method can be used to track some high-level events for all activities, even those - * that are not whitelisted for Content Capture. + * that are not allowlisted for Content Capture. * * @param event high-level activity event */ diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index fbfeda6f0bcc..10803cd7b561 100644 --- a/core/java/android/view/autofill/AutofillManager.java +++ b/core/java/android/view/autofill/AutofillManager.java @@ -509,7 +509,7 @@ public final class AutofillManager { /** * Views that were otherwised not important for autofill but triggered a session because the - * context is whitelisted for augmented autofill. + * context is allowlisted for augmented autofill. */ @GuardedBy("mLock") @Nullable private Set<AutofillId> mEnteredForAugmentedAutofillIds; @@ -2032,7 +2032,7 @@ public final class AutofillManager { /** * Explicitly limits augmented autofill to the given packages and activities. * - * <p>To reset the whitelist, call it passing {@code null} to both arguments. + * <p>To reset the allowlist, call it passing {@code null} to both arguments. * * <p>Useful when the service wants to restrict augmented autofill to a category of apps, like * apps that uses addresses. For example, if the service wants to support augmented autofill on @@ -2079,7 +2079,7 @@ public final class AutofillManager { } /** - * Notifies that a non-autofillable view was entered because the activity is whitelisted for + * Notifies that a non-autofillable view was entered because the activity is allowlisted for * augmented autofill. * * <p>This method is necessary to set the right flag on start, so the server-side session diff --git a/core/java/android/view/contentcapture/ContentCaptureManager.java b/core/java/android/view/contentcapture/ContentCaptureManager.java index 484b1c10423c..029552d4902e 100644 --- a/core/java/android/view/contentcapture/ContentCaptureManager.java +++ b/core/java/android/view/contentcapture/ContentCaptureManager.java @@ -81,7 +81,7 @@ import java.util.function.Consumer; * <a href="https://source.android.com/compatibility/cdd">CDD requirements</a>. * <li><b>Performance:</b> content capture is highly optimized to minimize its impact in the app * jankiness and overall device system health. For example, its only enabled on apps (or even - * specific activities from an app) that were explicitly whitelisted by the intelligence service, + * specific activities from an app) that were explicitly allowlisted by the intelligence service, * and it buffers the events so they are sent in a batch to the service (see * {@link #isContentCaptureEnabled()} for other cases when its disabled). * </ul> @@ -495,7 +495,7 @@ public final class ContentCaptureManager { /** * Gets the (optional) intent used to launch the service-specific settings. * - * <p>This method is static because it's called by Settings, which might not be whitelisted + * <p>This method is static because it's called by Settings, which might not be allowlisted * for content capture (in which case the ContentCaptureManager on its context would be null). * * @hide @@ -530,8 +530,8 @@ public final class ContentCaptureManager { * <p>There are many reasons it could be disabled, such as: * <ul> * <li>App itself disabled content capture through {@link #setContentCaptureEnabled(boolean)}. - * <li>Intelligence service did not whitelist content capture for this activity's package. - * <li>Intelligence service did not whitelist content capture for this specific activity. + * <li>Intelligence service did not allowlist content capture for this activity's package. + * <li>Intelligence service did not allowlist content capture for this specific activity. * <li>Intelligence service disabled content capture globally. * <li>User disabled content capture globally through the Android Settings app. * <li>Device manufacturer (OEM) disabled content capture globally. @@ -566,7 +566,7 @@ public final class ContentCaptureManager { public Set<ContentCaptureCondition> getContentCaptureConditions() { // NOTE: we could cache the conditions on ContentCaptureOptions, but then it would be stick // to the lifetime of the app. OTOH, by dynamically calling the server every time, we allow - // the service to fine tune how long-lived apps (like browsers) are whitelisted. + // the service to fine tune how long-lived apps (like browsers) are allowlisted. if (!isContentCaptureEnabled() && !mOptions.lite) return null; final SyncResultReceiver resultReceiver = syncRun( diff --git a/core/java/android/view/contentcapture/ContentCaptureSession.java b/core/java/android/view/contentcapture/ContentCaptureSession.java index 3f5ef5a2651d..34068e03d5e5 100644 --- a/core/java/android/view/contentcapture/ContentCaptureSession.java +++ b/core/java/android/view/contentcapture/ContentCaptureSession.java @@ -127,7 +127,7 @@ public abstract class ContentCaptureSession implements AutoCloseable { public static final int STATE_INTERNAL_ERROR = 0x100; /** - * Session is disabled because service didn't whitelist package or activity. + * Session is disabled because service didn't allowlist package or activity. * * @hide */ diff --git a/core/java/android/view/contentcapture/MainContentCaptureSession.java b/core/java/android/view/contentcapture/MainContentCaptureSession.java index c43beea98c7e..05353651258e 100644 --- a/core/java/android/view/contentcapture/MainContentCaptureSession.java +++ b/core/java/android/view/contentcapture/MainContentCaptureSession.java @@ -397,7 +397,7 @@ public final class MainContentCaptureSession extends ContentCaptureSession { + " after " + numberEvents + " delayed events"); } resetSession(STATE_DISABLED | STATE_NO_RESPONSE); - // TODO(b/111276913): blacklist activity / use special flag to indicate that + // TODO(b/111276913): denylist activity / use special flag to indicate that // when it's launched again return; } diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java index 508deacb49d7..0b92b93f2c88 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityShortcutChooserActivity.java @@ -42,7 +42,7 @@ import java.util.List; /** * Activity used to display various targets related to accessibility service, accessibility - * activity or white listing feature for volume key shortcut. + * activity or allowlisting feature for volume key shortcut. */ public class AccessibilityShortcutChooserActivity extends Activity { @ShortcutType diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java index d75659372a07..d84175ed1e7c 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java @@ -36,7 +36,7 @@ import com.android.internal.accessibility.dialog.TargetAdapter.ViewHolder; /** * Abstract base class for creating various target related to accessibility service, - * accessibility activity, and white listing feature. + * accessibility activity, and allowlisting feature. */ public abstract class AccessibilityTarget implements TargetOperations, OnTargetSelectedListener, OnTargetCheckedChangeListener { diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java index 60a102adcf7a..a7c5f6d5e03f 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java @@ -101,7 +101,7 @@ public final class AccessibilityTargetHelper { /** * Returns list of {@link AccessibilityTarget} of the installed accessibility service, - * accessibility activity, and white listing feature including accessibility feature's package + * accessibility activity, and allowlisting feature including accessibility feature's package * name, component id, etc. * * @param context The context of the application. diff --git a/core/java/com/android/internal/colorextraction/types/Tonal.java b/core/java/com/android/internal/colorextraction/types/Tonal.java index d2e71c85e7f9..88bdb66a2949 100644 --- a/core/java/com/android/internal/colorextraction/types/Tonal.java +++ b/core/java/com/android/internal/colorextraction/types/Tonal.java @@ -478,7 +478,7 @@ public class Tonal implements ExtractionType { public ConfigParser(Context context) { mTonalPalettes = new ArrayList<>(); - // Load all palettes and the blacklist from an XML. + // Load all palettes and the denylist from an XML. try { XmlPullParser parser = context.getResources().getXml(R.xml.color_extraction); int eventType = parser.getEventType(); diff --git a/core/java/com/android/internal/infra/GlobalWhitelistState.java b/core/java/com/android/internal/infra/GlobalWhitelistState.java index a0b2f94aea32..3c081e27305c 100644 --- a/core/java/com/android/internal/infra/GlobalWhitelistState.java +++ b/core/java/com/android/internal/infra/GlobalWhitelistState.java @@ -31,7 +31,7 @@ import java.util.List; /** * Helper class used to manage a {@link WhitelistHelper} per user instance when the main service * cannot hold a lock when external entities (typically {@code ActivityManagerService}) needs to - * get whitelist info. + * get allowlist info. * * <p>This class is thread safe. */ @@ -47,7 +47,7 @@ public class GlobalWhitelistState { protected SparseArray<WhitelistHelper> mWhitelisterHelpers; /** - * Sets the whitelist for the given user. + * Sets the allowlist for the given user. */ public void setWhitelist(@UserIdInt int userId, @Nullable List<String> packageNames, @Nullable List<ComponentName> components) { @@ -65,7 +65,7 @@ public class GlobalWhitelistState { } /** - * Checks if the given package is whitelisted for the given user. + * Checks if the given package is allowlisted for the given user. */ public boolean isWhitelisted(@UserIdInt int userId, @NonNull String packageName) { synchronized (mGlobalWhitelistStateLock) { @@ -76,7 +76,7 @@ public class GlobalWhitelistState { } /** - * Checks if the given component is whitelisted for the given user. + * Checks if the given component is allowlisted for the given user. */ public boolean isWhitelisted(@UserIdInt int userId, @NonNull ComponentName componentName) { synchronized (mGlobalWhitelistStateLock) { @@ -87,7 +87,7 @@ public class GlobalWhitelistState { } /** - * Gets the whitelisted components for the given package and user. + * Gets the allowlisted components for the given package and user. */ public ArraySet<ComponentName> getWhitelistedComponents(@UserIdInt int userId, @NonNull String packageName) { @@ -99,7 +99,7 @@ public class GlobalWhitelistState { } /** - * Resets the whitelist for the given user. + * Resets the allowlist for the given user. */ public void resetWhitelist(@NonNull int userId) { synchronized (mGlobalWhitelistStateLock) { diff --git a/core/java/com/android/internal/infra/WhitelistHelper.java b/core/java/com/android/internal/infra/WhitelistHelper.java index b1d85f78984c..1d76090f59f3 100644 --- a/core/java/com/android/internal/infra/WhitelistHelper.java +++ b/core/java/com/android/internal/infra/WhitelistHelper.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Objects; /** - * Helper class for keeping track of whitelisted packages/activities. + * Helper class for keeping track of allowlisted packages/activities. * * <p><b>NOTE: </b>this class is not thread safe. * @hide @@ -38,18 +38,18 @@ public final class WhitelistHelper { private static final String TAG = "WhitelistHelper"; /** - * Map of whitelisted packages/activities. The whole package is whitelisted if its + * Map of allowlisted packages/activities. The whole package is allowlisted if its * corresponding value is {@code null}. */ @Nullable private ArrayMap<String, ArraySet<ComponentName>> mWhitelistedPackages; /** - * Sets the whitelist with the given packages and activities. The list is cleared if both + * Sets the allowlist with the given packages and activities. The list is cleared if both * packageNames and components are {@code null}. * - * @param packageNames packages to be whitelisted. - * @param components activities to be whitelisted. + * @param packageNames packages to be allowlisted. + * @param components activities to be allowlisted. * * @throws IllegalArgumentException if packages or components are empty. */ @@ -103,7 +103,7 @@ public final class WhitelistHelper { } /** - * Returns {@code true} if the entire package is whitelisted. + * Returns {@code true} if the entire package is allowlisted. */ public boolean isWhitelisted(@NonNull String packageName) { Objects.requireNonNull(packageName); @@ -115,7 +115,7 @@ public final class WhitelistHelper { } /** - * Returns {@code true} if the specified activity is whitelisted. + * Returns {@code true} if the specified activity is allowlisted. */ public boolean isWhitelisted(@NonNull ComponentName componentName) { Objects.requireNonNull(componentName); @@ -130,8 +130,8 @@ public final class WhitelistHelper { } /** - * Returns a set of whitelisted components with the given package, or null if nothing is - * whitelisted. + * Returns a set of allowlisted components with the given package, or null if nothing is + * allowlisted. */ @Nullable public ArraySet<ComponentName> getWhitelistedComponents(@NonNull String packageName) { diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 069d19f6138f..15d4525ac884 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -206,7 +206,7 @@ public final class Zygote { /** List of packages with the same uid, and its app data info: volume uuid and inode. */ public static final String PKG_DATA_INFO_MAP = "--pkg-data-info-map"; - /** List of whitelisted packages and its app data info: volume uuid and inode. */ + /** List of allowlisted packages and its app data info: volume uuid and inode. */ public static final String WHITELISTED_DATA_INFO_MAP = "--whitelisted-data-info-map"; /** Bind mount app storage dirs to lower fs not via fuse */ @@ -327,7 +327,7 @@ public final class Zygote { * @param isTopApp true if the process is for top (high priority) application. * @param pkgDataInfoList A list that stores related packages and its app data * info: volume uuid and inode. - * @param whitelistedDataInfoList Like pkgDataInfoList, but it's for whitelisted apps. + * @param whitelistedDataInfoList Like pkgDataInfoList, but it's for allowlisted apps. * @param bindMountAppDataDirs True if the zygote needs to mount data dirs. * @param bindMountAppStorageDirs True if the zygote needs to mount storage dirs. * @@ -395,7 +395,7 @@ public final class Zygote { * volume uuid and CE dir inode. For example, pkgDataInfoList = [app_a_pkg_name, * app_a_data_volume_uuid, app_a_ce_inode, app_b_pkg_name, app_b_data_volume_uuid, * app_b_ce_inode, ...]; - * @param whitelistedDataInfoList Like pkgDataInfoList, but it's for whitelisted apps. + * @param whitelistedDataInfoList Like pkgDataInfoList, but it's for allowlisted apps. * @param bindMountAppDataDirs True if the zygote needs to mount data dirs. * @param bindMountAppStorageDirs True if the zygote needs to mount storage dirs. */ diff --git a/core/java/com/android/internal/os/ZygoteArguments.java b/core/java/com/android/internal/os/ZygoteArguments.java index 22082d02d9f6..ed074327c3c5 100644 --- a/core/java/com/android/internal/os/ZygoteArguments.java +++ b/core/java/com/android/internal/os/ZygoteArguments.java @@ -227,7 +227,7 @@ class ZygoteArguments { String[] mPkgDataInfoList; /** - * A list that stores all whitelisted app data info: volume uuid and inode. + * A list that stores all allowlisted app data info: volume uuid and inode. * Null if it does need to do app data isolation. */ String[] mWhitelistedDataInfoList; diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index d4a17123d7c6..a1540e52d84b 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -1118,7 +1118,7 @@ static pid_t ForkCommon(JNIEnv* env, bool is_system_server, // Temporarily block SIGCHLD during forks. The SIGCHLD handler might // log, which would result in the logging FDs we close being reopened. - // This would cause failures because the FDs are not whitelisted. + // This would cause failures because the FDs are not allowlisted. // // Note that the zygote process is single threaded at this point. BlockSignal(SIGCHLD, fail_fn); @@ -1324,7 +1324,7 @@ static void relabelAllDirs(const char* path, security_context_t context, fail_fn * in data directories. * * Steps: - * 1). Collect a list of all related apps (apps with same uid and whitelisted apps) data info + * 1). Collect a list of all related apps (apps with same uid and allowlisted apps) data info * (package name, data stored volume uuid, and inode number of its CE data directory) * 2). Mount tmpfs on /data/data, /data/user(_de) and /mnt/expand, so apps no longer * able to access apps data directly. diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index f1e186813ad8..84e56b7d6749 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -890,11 +890,11 @@ <p> This is a soft restricted permission which cannot be held by an app it its full form until the installer on record whitelists the permission. - Specifically, if the permission is whitelisted the holder app can access + Specifically, if the permission is allowlisted the holder app can access external storage and the visual and aural media collections while if the - permission is not whitelisted the holder app can only access to the visual + permission is not allowlisted the holder app can only access to the visual and aural medial collections. Also the permission is immutably restricted - meaning that the whitelist state can be specified only at install time and + meaning that the allowlist state can be specified only at install time and cannot change until the app is installed. For more details see {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}. <p>Protection level: dangerous --> @@ -918,7 +918,7 @@ read/write files in your application-specific directories returned by {@link android.content.Context#getExternalFilesDir} and {@link android.content.Context#getExternalCacheDir}. - <p>If this permission is not whitelisted for an app that targets an API level before + <p>If this permission is not allowlisted for an app that targets an API level before {@link android.os.Build.VERSION_CODES#Q} this permission cannot be granted to apps.</p> <p>Protection level: dangerous</p> --> @@ -3778,7 +3778,7 @@ <permission android:name="android.permission.UPGRADE_RUNTIME_PERMISSIONS" android:protectionLevel="signature" /> - <!-- @SystemApi Allows an application to whitelist restricted permissions + <!-- @SystemApi Allows an application to allowlist restricted permissions on any of the whitelists. @hide --> <permission android:name="android.permission.WHITELIST_RESTRICTED_PERMISSIONS" @@ -4152,7 +4152,7 @@ <permission android:name="android.permission.CHANGE_APP_IDLE_STATE" android:protectionLevel="signature|privileged" /> - <!-- @hide @SystemApi Allows an application to temporarily whitelist an inactive app to + <!-- @hide @SystemApi Allows an application to temporarily allowlist an inactive app to access the network and acquire wakelocks. <p>Not for use by third-party applications. --> <permission android:name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST" @@ -4774,7 +4774,7 @@ <permission android:name="android.permission.ACCESS_VR_STATE" android:protectionLevel="signature|preinstalled" /> - <!-- Allows an application to whitelist tasks during lock task mode + <!-- Allows an application to allowlist tasks during lock task mode @hide <p>Not for use by third-party applications.</p> --> <permission android:name="android.permission.UPDATE_LOCK_TASK_PACKAGES" android:protectionLevel="signature|setup" /> diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index f42b248f4670..0c63c1096a3a 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -271,7 +271,7 @@ <flag name="runtime" value="0x2000" /> <!-- Additional flag from base permission type: this permission can be granted only if its protection level is signature, the requesting app resides on the OEM partition, - and the OEM has white-listed the app to receive this permission by the OEM. + and the OEM has allowlisted the app to receive this permission by the OEM. --> <flag name="oem" value="0x4000" /> <!-- Additional flag from base permission type: this permission can be granted to @@ -338,7 +338,7 @@ <flag name="softRestricted" value="0x8" /> <!-- This permission is restricted immutably which means that its restriction state may be specified only on the first install of - the app and will stay in this initial whitelist state until + the app and will stay in this initial allowlist state until the app is uninstalled. --> <flag name="immutablyRestricted" value="0x10" /> @@ -1407,13 +1407,13 @@ <attr name="lockTaskMode"> <!-- This is the default value. Tasks will not launch into lockTask mode but can be placed there by calling {@link android.app.Activity#startLockTask}. If a task with - this mode has been whitelisted using {@link + this mode has been allowlisted using {@link android.app.admin.DevicePolicyManager#setLockTaskPackages} then calling {@link android.app.Activity#startLockTask} will enter lockTask mode immediately, otherwise the user will be presented with a dialog to approve entering pinned mode. <p>If the system is already in lockTask mode when a new task rooted at this activity is launched that task will or will not start depending on whether the package of this - activity has been whitelisted. + activity has been allowlisted. <p>Tasks rooted at this activity can only exit lockTask mode using {@link android.app.Activity#stopLockTask}. --> <enum name="normal" value="0"/> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 17b156155ecf..8aae043a3919 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -364,7 +364,7 @@ less than 0x600 --> <bool translatable="false" name="config_apfDrop802_3Frames">true</bool> - <!-- An array of Black listed EtherType, packets with EtherTypes within this array + <!-- An array of Denylisted EtherType, packets with EtherTypes within this array will be dropped TODO: need to put proper values, these are for testing purposes only --> <integer-array translatable="false" name="config_apfEthTypeBlackList"> @@ -2300,18 +2300,18 @@ will be locked. --> <bool name="config_multiuserDelayUserDataLocking">false</bool> - <!-- Whether to only install system packages on a user if they're whitelisted for that user + <!-- Whether to only install system packages on a user if they're allowlisted for that user type. These are flags and can be freely combined. - 0 - disable whitelist (install all system packages; no logging) - 1 - enforce (only install system packages if they are whitelisted) - 2 - log (log non-whitelisted packages) - 4 - any package not mentioned in the whitelist file is implicitly whitelisted on all users + 0 - disable allowlist (install all system packages; no logging) + 1 - enforce (only install system packages if they are allowlisted) + 2 - log (log non-allowlisted packages) + 4 - any package not mentioned in the allowlist file is implicitly allowlisted on all users 8 - same as 4, but just for the SYSTEM user 16 - ignore OTAs (don't install system packages during OTAs) Common scenarios: - - to enable feature (fully enforced) for a complete whitelist: 1 - - to enable feature for an incomplete whitelist (so use implicit whitelist mode): 5 - - to enable feature but implicitly whitelist for SYSTEM user to ease local development: 9 + - to enable feature (fully enforced) for a complete allowlist: 1 + - to enable feature for an incomplete allowlist (so use implicit allowlist mode): 5 + - to enable feature but implicitly allowlist for SYSTEM user to ease local development: 9 - to disable feature completely if it had never been enabled: 16 - to henceforth disable feature and try to undo its previous effects: 0 Note: This list must be kept current with PACKAGE_WHITELIST_MODE_PROP in @@ -2489,7 +2489,7 @@ Example: com.google.android.myapp/.resolver.MyResolverActivity --> <string name="config_customResolverActivity" translatable="false"></string> - <!-- Name of the activity or service that prompts the user to reject, accept, or whitelist + <!-- Name of the activity or service that prompts the user to reject, accept, or allowlist an adb host's public key, when an unwhitelisted host connects to the local adbd. Can be customized for other product types --> <string name="config_customAdbPublicKeyConfirmationComponent" @@ -2501,7 +2501,7 @@ <string name="config_customAdbPublicKeyConfirmationSecondaryUserComponent" >com.android.systemui/com.android.systemui.usb.UsbDebuggingSecondaryUserActivity</string> - <!-- Name of the activity or service that prompts the user to reject, accept, or whitelist + <!-- Name of the activity or service that prompts the user to reject, accept, or allowlist a wireless network for wireless debugging. Can be customized for other product types --> <string name="config_customAdbWifiNetworkConfirmationComponent" @@ -4261,10 +4261,10 @@ we only enabled it while the device has ability of mixed color spaces composition --> <bool name="config_enableWcgMode">false</bool> - <!-- When true, enables the whitelisted app to handle bug reports from power menu short press. --> + <!-- When true, enables the allowlisted app to handle bug reports from power menu short press. --> <bool name="config_bugReportHandlerEnabled">false</bool> - <!-- The package name for the default bug report handler app from power menu short press. This app must be whitelisted. --> + <!-- The package name for the default bug report handler app from power menu short press. This app must be allowlisted. --> <string name="config_defaultBugReportHandlerApp" translatable="false"></string> <!-- The default value used for RawContacts.ACCOUNT_NAME when contacts are inserted without this |