summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chan Kim <kimchan@google.com> 2023-08-18 22:33:59 +0000
committer Chan Kim <kimchan@google.com> 2023-08-22 08:10:51 +0000
commitb12c1b74262d41a233ed6548c393b06b97cdd3b4 (patch)
tree1e854bfbbc44cb2bdbda3d4175585f9915a30372
parente1ee1aab9f99d05ca97dee3701afb894a6129446 (diff)
Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference For this round, the fixes are only applied to the following to minimize breaking dependencies: * comments (excluding javaDoc annotations) * private constants * private functions * parameters within functions BYPASS_INCLUSIVE_LANGUAGE_REASON=Just updating a few select inclusive language violations. No-Typo-Check: Changes focused on inclusive language violations. BUG: 295342157 Change-Id: I900f7e9ad19d3c264a032f1263ac30b4e6362633
-rw-r--r--core/java/android/content/Context.java2
-rw-r--r--core/java/android/content/IntentSender.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 21d4b6461214..d04d8bed56f2 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -473,7 +473,7 @@ public abstract class Context {
public static final int BIND_IMPORTANT_BACKGROUND = 0x00800000;
/**
- * @hide Flag for {@link #bindService}: allows application hosting service to manage whitelists
+ * @hide Flag for {@link #bindService}: allows application hosting service to manage allowlists
* such as temporary allowing a {@code PendingIntent} to bypass Power Save mode.
*/
public static final int BIND_ALLOW_WHITELIST_MANAGEMENT = 0x01000000;
diff --git a/core/java/android/content/IntentSender.java b/core/java/android/content/IntentSender.java
index 49d3cac63124..d4d9e4759b4b 100644
--- a/core/java/android/content/IntentSender.java
+++ b/core/java/android/content/IntentSender.java
@@ -392,9 +392,9 @@ public class IntentSender implements Parcelable {
}
/** @hide */
- public IntentSender(IIntentSender target, IBinder whitelistToken) {
+ public IntentSender(IIntentSender target, IBinder allowlistToken) {
mTarget = target;
- mWhitelistToken = whitelistToken;
+ mWhitelistToken = allowlistToken;
}
/** @hide */