diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2020-09-11 15:10:20 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2020-09-14 10:00:10 -0600 |
| commit | 4172f8a62ccacb752c5de165ee305f7223a6e423 (patch) | |
| tree | f5b3f6cdc8d864ecd3ed63921de418b4a5f3595f /services/contentcapture | |
| parent | a8cec413b65bfc3ea23575b34eb983c20944491b (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/contentcapture')
2 files changed, 5 insertions, 5 deletions
diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java index ea94ad0b3c20..a153265ed228 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java @@ -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 " diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java index 9486b0d39bc2..9075b78495e4 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java @@ -571,7 +571,7 @@ final class ContentCapturePerUserService } /** - * Resets the content capture whitelist. + * Resets the content capture allowlist. */ @GuardedBy("mLock") private void resetContentCaptureWhitelistLocked() { @@ -598,7 +598,7 @@ final class ContentCapturePerUserService mMaster.mGlobalContentCaptureOptions.setWhitelist(mUserId, packages, activities); writeSetWhitelistEvent(getServiceComponentName(), packages, activities); - // Must disable session that are not the whitelist anymore... + // Must disable session that are not the allowlist anymore... final int numSessions = mSessions.size(); if (numSessions <= 0) return; |