diff options
| author | 2023-08-23 23:11:00 +0000 | |
|---|---|---|
| committer | 2023-08-23 23:11:00 +0000 | |
| commit | 2767dd9d49af78f2ac39e84f9ec602831f8764c5 (patch) | |
| tree | 1edbd2c6130412bc3c89e5707c255162ddee2f2f | |
| parent | ca6f08759407ddc99b1b3e7e6e24bc9090fe6572 (diff) | |
| parent | f82f607de2a1f79e217b5b05fb7ef7d32233c4bd (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" into main am: f82f607de2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2718258
Change-Id: Iecc1ba0d1614d72fe91d5fb9c653b9cc7cbdec85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/content/Context.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/IntentSender.java | 4 |
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 */ |