From 7ef20dd340708f6a542aa0859b3dd2652a0e9385 Mon Sep 17 00:00:00 2001 From: Ruchi Kandoi Date: Wed, 30 Mar 2016 14:23:58 -0700 Subject: [PATCH] Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API." This reverts commit 302710deaa02ad5fba5e39d9f0f652d3587b8b91. Change-Id: I3e7e071838bae9460e126aac099b31f5213e3c6c --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/os/PowerManager.java | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 298f6c4b192ff..09eee2fc40254 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 { diff --git a/api/system-current.txt b/api/system-current.txt index 0651c6170bd84..a0384836e1760 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 2a9f452058bf4..d01bdc3e67fff 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 { diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 8bc903b96bcfc..a0a16f1a89305 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -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. *

- * - * {@hide} */ public static final int SUSTAINED_PERFORMANCE_WAKE_LOCK = 0x00000100;