summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorRuchi Kandoi <kandoiruchi@google.com>2016-03-31 00:54:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-31 00:54:25 +0000
commit93cfef460c4d15c706bfb03456a00f6e6086b989 (patch)
tree79349e537b0f3ab1c6fcd7f8acfaab5f00a9a461 /core/java/android
parentaeaa8d62563da3b615f54b564e01aba3a98f29da (diff)
parent7ef20dd340708f6a542aa0859b3dd2652a0e9385 (diff)
Merge "Revert "PowerManager: Hide the SUSTAINED_PERFORMANCE API."" into nyc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/PowerManager.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 8bc903b96bcf..a0a16f1a8930 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.
* </p>
- *
- * {@hide}
*/
public static final int SUSTAINED_PERFORMANCE_WAKE_LOCK = 0x00000100;