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

Commit 93cfef46 authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by Android (Google) Code Review
Browse files

Merge "Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."" into nyc-dev

parents aeaa8d62 7ef20dd3

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29129,6 +29129,7 @@ package android.os { 
    field public static final int RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY = 1; // 0x1

    field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa

    field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6

    field public static final int SUSTAINED_PERFORMANCE_WAKE_LOCK = 256; // 0x100

  }















  public final class PowerManager.WakeLock {

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -31376,6 +31376,7 @@ package android.os {













    field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa















    field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6















    field public static final int USER_ACTIVITY_EVENT_ACCESSIBILITY = 3; // 0x3













    field public static final int SUSTAINED_PERFORMANCE_WAKE_LOCK = 256; // 0x100















    field public static final int USER_ACTIVITY_EVENT_BUTTON = 1; // 0x1















    field public static final int USER_ACTIVITY_EVENT_OTHER = 0; // 0x0















    field public static final int USER_ACTIVITY_EVENT_TOUCH = 2; // 0x2

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -29194,6 +29194,7 @@ package android.os {













    field public static final int RELEASE_FLAG_WAIT_FOR_NO_PROXIMITY = 1; // 0x1















    field public static final deprecated int SCREEN_BRIGHT_WAKE_LOCK = 10; // 0xa















    field public static final deprecated int SCREEN_DIM_WAKE_LOCK = 6; // 0x6













    field public static final int SUSTAINED_PERFORMANCE_WAKE_LOCK = 256; // 0x100















  }





























  public final class PowerManager.WakeLock {

























core/java/android/os/PowerManager.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -224,8 +224,6 @@ public final class PowerManager {













     * This is used by Gaming and VR applications to ensure the device provides















     * will provide consistent performance over a large amount of time.















     * </p>













     *













     * {@hide}















     */















    public static final int SUSTAINED_PERFORMANCE_WAKE_LOCK = 0x00000100;