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

Commit f82f607d authored by Chan Kim's avatar Chan Kim Committed by Gerrit Code Review
Browse files

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

parents 0637b02c b12c1b74

core/java/android/content/Context.java

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

core/java/android/content/IntentSender.java

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