Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 479f9593 authored by Chan Kim's avatar Chan Kim Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" into main am: f82f607d am: 2767dd9d am: fa0a6847

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2718258



Change-Id: I34d7a04e6ae36eb9722db8b54b89b8ff018d6f97
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c623d605 fa0a6847

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -592,7 +592,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;

core/java/android/content/IntentSender.java

+2 −2
Original line number Diff line number Diff line
@@ -396,9 +396,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 */