commit 7034a6e2d05c45c437bef6150bcc70b58b3ccb3b
author Chenjie Luo <cjluo@google.com> Thu Jan 14 02:29:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 14 02:29:13 2016 +0000
tree 75e20673a719ab72749df8190e2dfb7d7edae918
parent a5c71060174c5357c75592998fb095e768eca8bd
parent d5cea64d8d63e9ffb61af1e669962de08ea513cc

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

core/java/android/view/KeyEvent.java

diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 052ef7c..19d5c73 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1846,6 +1846,9 @@
             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;