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

Commit 1c440689 authored by Philip Junker's avatar Philip Junker Committed by Automerger Merge Worker
Browse files

Merge "Deprecate ACQUIRE_CAUSES_WAKEUP flag." into tm-dev am: eefc676f 

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

Change-Id: I6e345d0926de8a0463cb86191f033cea703f8528
parents e9756276 eefc676f

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31802,7 +31802,7 @@ package android.os { 
    method public android.os.PowerManager.WakeLock newWakeLock(int, String);

    method @RequiresPermission(android.Manifest.permission.REBOOT) public void reboot(@Nullable String);

    method public void removeThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener);

    field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000

    field @Deprecated public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000

    field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";

    field public static final String ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED";

    field public static final String ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED = "android.os.action.LOW_POWER_STANDBY_ENABLED_CHANGED";

core/java/android/os/PowerManager.java

+10 −6
Original line number Diff line number Diff line
@@ -183,25 +183,29 @@ public final class PowerManager { 
    /**

     * Wake lock flag: Turn the screen on when the wake lock is acquired.

     * <p>

     * Normally wake locks don't actually wake the device, they just cause

     * the screen to remain on once it's already on.  Think of the video player

     * application as the normal behavior.  Notifications that pop up and want

     * the device to be on are the exception; use this flag to be like them.

     * Normally wake locks don't actually wake the device, they just cause the screen to remain on

     * once it's already on. This flag will cause the device to wake up when the wake lock is

     * acquired.

     * </p><p>

     * Android TV playback devices attempt to turn on the HDMI-connected TV via HDMI-CEC on any

     * wake-up, including wake-ups triggered by wake locks.

     * </p><p>

     * Cannot be used with {@link #PARTIAL_WAKE_LOCK}.

     * </p>

     *

     * @deprecated Most applications should use {@link android.R.attr#turnScreenOn} or

     * {@link android.app.Activity#setTurnScreenOn(boolean)} instead, as this prevents the previous

     * foreground app from being resumed first when the screen turns on. Note that this flag may

     * require a permission in the future.

     */

    @Deprecated

    public static final int ACQUIRE_CAUSES_WAKEUP = 0x10000000;



    /**

     * Wake lock flag: When this wake lock is released, poke the user activity timer

     * so the screen stays on for a little longer.

     * <p>

     * Will not turn the screen on if it is not already on.

     * See {@link #ACQUIRE_CAUSES_WAKEUP} if you want that.

     * This will not turn the screen on if it is not already on.

     * </p><p>

     * Cannot be used with {@link #PARTIAL_WAKE_LOCK}.

     * </p>