summaryrefslogtreecommitdiff
path: root/services/appwidget
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2020-09-11 15:10:20 -0600
committerJeff Sharkey <jsharkey@android.com>2020-09-14 10:00:10 -0600
commit4172f8a62ccacb752c5de165ee305f7223a6e423 (patch)
treef5b3f6cdc8d864ecd3ed63921de418b4a5f3595f /services/appwidget
parenta8cec413b65bfc3ea23575b34eb983c20944491b (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: If75259aab72329f9f8b0e1972a96370ca5134e2c
Diffstat (limited to 'services/appwidget')
-rw-r--r--services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index d7a3a32f102a..060d0971e391 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -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),