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

Commit 705f6bec authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

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: I53003332717baf57dc088b2f6b969cdb1863f65e
parent 70b20ee0

core/java/android/accounts/ChooseTypeAndAccountActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ public class ChooseTypeAndAccountActivity extends Activity 
    }



    /**

     * Returns a set of whitelisted accounts given by the intent or null if none specified by the

     * Returns a set of allowlisted accounts given by the intent or null if none specified by the

     * intent.

     */

    private Set<Account> getAllowableAccountSet(final Intent intent) {

core/java/android/app/Activity.java

+2 −2
Original line number Diff line number Diff line
@@ -8348,7 +8348,7 @@ public class Activity extends ContextThemeWrapper 
     *

     * <p>If {@link DevicePolicyManager#isLockTaskPermitted(String)} returns {@code true}

     * for this component, the current task will be launched directly into LockTask mode. Only apps

     * whitelisted by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])} can

     * allowlisted by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])} can

     * be launched while LockTask mode is active. The user will not be able to leave this mode

     * until this activity calls {@link #stopLockTask()}. Calling this method while the device is

     * already in LockTask mode has no effect.
@@ -8380,7 +8380,7 @@ public class Activity extends ContextThemeWrapper 
     * <p><strong>Note:</strong> If the device is in LockTask mode that is not initially started

     * by this activity, then calling this method will not terminate the LockTask mode, but only

     * finish its own task. The device will remain in LockTask mode, until the activity which

     * started the LockTask mode calls this method, or until its whitelist authorization is revoked

     * started the LockTask mode calls this method, or until its allowlist authorization is revoked

     * by {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])}.

     *

     * @see #startLockTask()

core/java/android/app/ActivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -4875,9 +4875,9 @@ public class ActivityManager { 
    }



    /**

     * Get packages of bugreport-whitelisted apps to handle a bug report.

     * Get packages of bugreport-allowlisted apps to handle a bug report.

     *

     * @return packages of bugreport-whitelisted apps to handle a bug report.

     * @return packages of bugreport-allowlisted apps to handle a bug report.

     * @hide

     */

    public List<String> getBugreportWhitelistedPackages() {

core/java/android/app/BroadcastOptions.java

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class BroadcastOptions { 
    private boolean mAllowBackgroundActivityStarts;



    /**

     * How long to temporarily put an app on the power whitelist when executing this broadcast

     * How long to temporarily put an app on the power allowlist when executing this broadcast

     * to it.

     */

    static final String KEY_TEMPORARY_APP_WHITELIST_DURATION
@@ -87,8 +87,8 @@ public class BroadcastOptions { 


    /**

     * Set a duration for which the system should temporary place an application on the

     * power whitelist when this broadcast is being delivered to it.

     * @param duration The duration in milliseconds; 0 means to not place on whitelist.

     * power allowlist when this broadcast is being delivered to it.

     * @param duration The duration in milliseconds; 0 means to not place on allowlist.

     */

    @RequiresPermission(android.Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST)

    public void setTemporaryAppWhitelistDuration(long duration) {

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ public class Notification implements Parcelable 
    public ArraySet<PendingIntent> allPendingIntents;



    /**

     * Token identifying the notification that is applying doze/bgcheck whitelisting to the

     * Token identifying the notification that is applying doze/bgcheck allowlisting to the

     * pending intents inside of it, so only those will get the behavior.

     *

     * @hide