diff options
| author | Nick Armstrong-Crews <strongarm@google.com> | 2015-09-08 04:48:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-08 04:48:30 +0000 |
| commit | dc6aa5fc53a85a3fcf98c1a01f766d9c16891765 (patch) | |
| tree | 7d8effec5b71b5b9e58c01a898d670f4b5b4b35b /core/java/android/view/KeyEvent.java | |
| parent | 1fb5edd78395f68b3fcda3966ebf5330ccbe19c4 (diff) | |
| parent | d70377b537450d03d5cdc2efb15977d48e5cfebd (diff) | |
am d70377b5: am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit 'd70377b537450d03d5cdc2efb15977d48e5cfebd':
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
Diffstat (limited to 'core/java/android/view/KeyEvent.java')
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 1c20cab55a5d..6d898240cc90 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -788,10 +788,8 @@ 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. */ - public static final int KEYCODE_SOFT_SLEEP = 276; - private static final int LAST_KEYCODE = KEYCODE_SOFT_SLEEP; + private static final int LAST_KEYCODE = KEYCODE_MEDIA_STEP_BACKWARD; // NOTE: If you add a new keycode here you must also add it to: // isSystem() |