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/backup | |
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/backup')
-rw-r--r-- | services/backup/backuplib/java/com/android/server/backup/TransportManager.java | 4 | ||||
-rw-r--r-- | services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java index 30ce4cf2fd3f..9cf7b428f29f 100644 --- a/services/backup/backuplib/java/com/android/server/backup/TransportManager.java +++ b/services/backup/backuplib/java/com/android/server/backup/TransportManager.java @@ -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( diff --git a/services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java b/services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java index ca89f7f69fbc..0eb3ea3e1bc8 100644 --- a/services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java +++ b/services/backup/backuplib/java/com/android/server/backup/transport/TransportClient.java @@ -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); |