summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorNick Armstrong-Crews <strongarm@google.com>2015-09-09 19:59:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-09 19:59:50 +0000
commitb64f05507f638341f88c0f43d20dad880bb8bf44 (patch)
tree7716083f09100c61945a6e1d8f9c68761f23d1e4 /core/java
parent05cc71dca19746aa86bc50d0bb1eff13990648c2 (diff)
parent3a5a8c741b5e6e4bb6f6729409f409f341cdb2bb (diff)
Merge "Remove @hide for KEYCODE_SOFT_SLEEP."
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/KeyEvent.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 61ba59049c13..1c20cab55a5d 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -788,8 +788,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
/** Key code constant: Step backward media key.
* Steps media backward, one frame at a time. */
public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275;
- /** Key code constant: put device to sleep unless a wakelock is held.
- * @hide */
+ /** Key code constant: put device to sleep unless a wakelock is held. */
public static final int KEYCODE_SOFT_SLEEP = 276;
private static final int LAST_KEYCODE = KEYCODE_SOFT_SLEEP;