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

Commit 40482567 authored by Treehugger Robot's avatar Treehugger Robot 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: 912fb314 am: 884d2cca am: 33aaa056 am: 2367bca6

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



Change-Id: Id8640f8b58eb8593153687782735a64c4b4c5b65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd3314bf 2367bca6

apex/jobscheduler/framework/java/android/app/job/JobInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ public class JobInfo implements Parcelable { 


    /**

     * Allows this job to run despite doze restrictions as long as the app is in the foreground

     * or on the temporary whitelist

     * or on the temporary allowlist

     * @hide

     */

    public static final int FLAG_IMPORTANT_WHILE_FOREGROUND = 1 << 1;
@@ -2042,13 +2042,13 @@ public class JobInfo implements Parcelable { 


        /**

         * Setting this to true indicates that this job is important while the scheduling app

         * is in the foreground or on the temporary whitelist for background restrictions.

         * is in the foreground or on the temporary allowlist for background restrictions.

         * This means that the system will relax doze restrictions on this job during this time.

         *

         * Apps should use this flag only for short jobs that are essential for the app to function

         * properly in the foreground.

         *

         * Note that once the scheduling app is no longer whitelisted from background restrictions

         * Note that once the scheduling app is no longer allowlisted from background restrictions

         * and in the background, or the job failed due to unsatisfied constraints,

         * this job should be expected to behave like other jobs without this flag.

         *

apex/jobscheduler/framework/java/android/os/PowerWhitelistManager.java

+38 −38
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ import java.lang.annotation.RetentionPolicy; 
import java.util.List;



/**

 * Interface to access and modify the permanent and temporary power save whitelist. The two lists

 * are kept separately. Apps placed on the permanent whitelist are only removed via an explicit

 * removeFromWhitelist call. Apps whitelisted by default by the system cannot be removed. Apps

 * placed on the temporary whitelist are removed from that whitelist after a predetermined amount of

 * Interface to access and modify the permanent and temporary power save allowlist. The two lists

 * are kept separately. Apps placed on the permanent allowlist are only removed via an explicit

 * removeFromAllowlist call. Apps whitelisted by default by the system cannot be removed. Apps

 * placed on the temporary allowlist are removed from that allowlist after a predetermined amount of

 * time.

 *

 * @deprecated Use {@link PowerExemptionManager} instead
@@ -50,18 +50,18 @@ public class PowerWhitelistManager { 
    private final PowerExemptionManager mPowerExemptionManager;



    /**

     * Indicates that an unforeseen event has occurred and the app should be whitelisted to handle

     * Indicates that an unforeseen event has occurred and the app should be allowlisted to handle

     * it.

     */

    public static final int EVENT_UNSPECIFIED = PowerExemptionManager.EVENT_UNSPECIFIED;



    /**

     * Indicates that an SMS event has occurred and the app should be whitelisted to handle it.

     * Indicates that an SMS event has occurred and the app should be allowlisted to handle it.

     */

    public static final int EVENT_SMS = PowerExemptionManager.EVENT_SMS;



    /**

     * Indicates that an MMS event has occurred and the app should be whitelisted to handle it.

     * Indicates that an MMS event has occurred and the app should be allowlisted to handle it.

     */

    public static final int EVENT_MMS = PowerExemptionManager.EVENT_MMS;
@@ -381,7 +381,7 @@ public class PowerWhitelistManager { 
    }



    /**

     * Add the specified package to the permanent power save whitelist.

     * Add the specified package to the permanent power save allowlist.

     *

     * @deprecated Use {@link PowerExemptionManager#addToPermanentAllowList(String)} instead

     */
@@ -392,7 +392,7 @@ public class PowerWhitelistManager { 
    }



    /**

     * Add the specified packages to the permanent power save whitelist.

     * Add the specified packages to the permanent power save allowlist.

     *

     * @deprecated Use {@link PowerExemptionManager#addToPermanentAllowList(List)} instead

     */
@@ -403,10 +403,10 @@ public class PowerWhitelistManager { 
    }



    /**

     * Get a list of app IDs of app that are whitelisted. This does not include temporarily

     * whitelisted apps.

     * Get a list of app IDs of app that are allowlisted. This does not include temporarily

     * allowlisted apps.

     *

     * @param includingIdle Set to true if the app should be whitelisted from device idle as well

     * @param includingIdle Set to true if the app should be allowlisted from device idle as well

     *                      as other power save restrictions

     * @deprecated Use {@link PowerExemptionManager#getAllowListedAppIds(boolean)} instead

     * @hide
@@ -418,10 +418,10 @@ public class PowerWhitelistManager { 
    }



    /**

     * Returns true if the app is whitelisted from power save restrictions. This does not include

     * temporarily whitelisted apps.

     * Returns true if the app is allowlisted from power save restrictions. This does not include

     * temporarily allowlisted apps.

     *

     * @param includingIdle Set to true if the app should be whitelisted from device

     * @param includingIdle Set to true if the app should be allowlisted from device

     *                      idle as well as other power save restrictions

     * @deprecated Use {@link PowerExemptionManager#isAllowListed(String, boolean)} instead

     * @hide
@@ -432,11 +432,11 @@ public class PowerWhitelistManager { 
    }



    /**

     * Remove an app from the permanent power save whitelist. Only apps that were added via

     * Remove an app from the permanent power save allowlist. Only apps that were added via

     * {@link #addToWhitelist(String)} or {@link #addToWhitelist(List)} will be removed. Apps

     * whitelisted by default by the system cannot be removed.

     * allowlisted by default by the system cannot be removed.

     *

     * @param packageName The app to remove from the whitelist

     * @param packageName The app to remove from the allowlist

     * @deprecated Use {@link PowerExemptionManager#removeFromPermanentAllowList(String)} instead

     */

    @Deprecated
@@ -446,10 +446,10 @@ public class PowerWhitelistManager { 
    }



    /**

     * Add an app to the temporary whitelist for a short amount of time.

     * Add an app to the temporary allowlist for a short amount of time.

     *

     * @param packageName The package to add to the temp whitelist

     * @param durationMs  How long to keep the app on the temp whitelist for (in milliseconds)

     * @param packageName The package to add to the temp allowlist

     * @param durationMs  How long to keep the app on the temp allowlist for (in milliseconds)

     * @param reasonCode one of {@link ReasonCode}, use {@link #REASON_UNKNOWN} if not sure.

     * @param reason a optional human readable reason string, could be null or empty string.

     * @deprecated Use {@link PowerExemptionManager#addToTemporaryAllowList(
@@ -463,10 +463,10 @@ public class PowerWhitelistManager { 
    }



    /**

     * Add an app to the temporary whitelist for a short amount of time.

     * Add an app to the temporary allowlist for a short amount of time.

     *

     * @param packageName The package to add to the temp whitelist

     * @param durationMs  How long to keep the app on the temp whitelist for (in milliseconds)

     * @param packageName The package to add to the temp allowlist

     * @param durationMs  How long to keep the app on the temp allowlist for (in milliseconds)

     * @deprecated Use {@link PowerExemptionManager#addToTemporaryAllowList(

     *             String, int, String, long)} instead

     */
@@ -478,15 +478,15 @@ public class PowerWhitelistManager { 
    }



    /**

     * Add an app to the temporary whitelist for a short amount of time for a specific reason. The

     * temporary whitelist is kept separately from the permanent whitelist and apps are

     * automatically removed from the temporary whitelist after a predetermined amount of time.

     * Add an app to the temporary allowlist for a short amount of time for a specific reason. The

     * temporary allowlist is kept separately from the permanent allowlist and apps are

     * automatically removed from the temporary allowlist after a predetermined amount of time.

     *

     * @param packageName The package to add to the temp whitelist

     * @param event       The reason to add the app to the temp whitelist

     * @param reason      A human-readable reason explaining why the app is temp whitelisted. Only

     * @param packageName The package to add to the temp allowlist

     * @param event       The reason to add the app to the temp allowlist

     * @param reason      A human-readable reason explaining why the app is temp allowlisted. Only

     *                    used for logging purposes. Could be null or empty string.

     * @return The duration (in milliseconds) that the app is whitelisted for

     * @return The duration (in milliseconds) that the app is allowlisted for

     * @deprecated Use {@link PowerExemptionManager#addToTemporaryAllowListForEvent(

     *             String, int, String, int)} instead

     */
@@ -499,16 +499,16 @@ public class PowerWhitelistManager { 
    }



    /**

     * Add an app to the temporary whitelist for a short amount of time for a specific reason. The

     * temporary whitelist is kept separately from the permanent whitelist and apps are

     * automatically removed from the temporary whitelist after a predetermined amount of time.

     * Add an app to the temporary allowlist for a short amount of time for a specific reason. The

     * temporary allowlist is kept separately from the permanent allowlist and apps are

     * automatically removed from the temporary allowlist after a predetermined amount of time.

     *

     * @param packageName The package to add to the temp whitelist

     * @param event       The reason to add the app to the temp whitelist

     * @param packageName The package to add to the temp allowlist

     * @param event       The reason to add the app to the temp allowlist

     * @param reasonCode  one of {@link ReasonCode}, use {@link #REASON_UNKNOWN} if not sure.

     * @param reason      A human-readable reason explaining why the app is temp whitelisted. Only

     * @param reason      A human-readable reason explaining why the app is temp allowlisted. Only

     *                    used for logging purposes. Could be null or empty string.

     * @return The duration (in milliseconds) that the app is whitelisted for

     * @return The duration (in milliseconds) that the app is allowlisted for

     * @deprecated Use {@link PowerExemptionManager#addToTemporaryAllowListForEvent(

     *             String, int, String, int)} instead

     */