diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-04-11 03:49:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 03:49:37 +0000 |
| commit | 337e764debde56b1462fb5f2794b3e917d8a42e2 (patch) | |
| tree | 5a2b4e77654a0897408f04e429045e49359a0e4b /core/java/android/view/KeyEvent.java | |
| parent | cd5e3f85fc9228b943ee8dfda0951e068953596c (diff) | |
| parent | f24687e2731811fd0e3803b691fd47a659f89329 (diff) | |
| download | frameworks_base-337e764debde56b1462fb5f2794b3e917d8a42e2.zip frameworks_base-337e764debde56b1462fb5f2794b3e917d8a42e2.tar.gz frameworks_base-337e764debde56b1462fb5f2794b3e917d8a42e2.tar.bz2 | |
am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
Plumb display power state through display manager.
Diffstat (limited to 'core/java/android/view/KeyEvent.java')
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 437ccfb..7b389c0 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -1167,9 +1167,13 @@ public class KeyEvent extends InputEvent implements Parcelable { /** * This mask is set if the device woke because of this key event. + * + * @deprecated This flag will never be set by the system since the system + * consumes all wake keys itself. */ + @Deprecated public static final int FLAG_WOKE_HERE = 0x1; - + /** * This mask is set if the key event was generated by a software keyboard. */ |