summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chenjie Luo <cjluo@google.com> 2016-01-14 02:29:13 +0000
committer android-build-merger <android-build-merger@google.com> 2016-01-14 02:29:13 +0000
commit7034a6e2d05c45c437bef6150bcc70b58b3ccb3b (patch)
tree75e20673a719ab72749df8190e2dfb7d7edae918
parenta5c71060174c5357c75592998fb095e768eca8bd (diff)
parentd5cea64d8d63e9ffb61af1e669962de08ea513cc (diff)
Merge "Add STEM_1, STEM_2 and STEM_3 key as wakeup keys" into cw-e-dev am: 4a577bff96
am: d5cea64d8d * commit 'd5cea64d8d63e9ffb61af1e669962de08ea513cc': Add STEM_1, STEM_2 and STEM_3 key as wakeup keys
-rw-r--r--core/java/android/view/KeyEvent.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 052ef7c73e77..19d5c730368a 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1846,6 +1846,9 @@ public class KeyEvent extends InputEvent implements Parcelable {
case KeyEvent.KEYCODE_MENU:
case KeyEvent.KEYCODE_WAKEUP:
case KeyEvent.KEYCODE_PAIRING:
+ case KeyEvent.KEYCODE_STEM_1:
+ case KeyEvent.KEYCODE_STEM_2:
+ case KeyEvent.KEYCODE_STEM_3:
return true;
}
return false;