commit 35851e2abbfe8f1d9c4cc7dc13a6e6e155b61664
author Christopher Tate <ctate@google.com> Thu Jul 02 02:45:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 02 02:45:16 2015 +0000
tree 56ad597ef5bfa29de855b23abdaf0b11b75a94f6
parent 110654ae44e45b1afd5badd24ada96cb9018bed1
parent 38ff2b44ad7a64768cd1bb8793ec6c45e8d1e68e

am 38ff2b44: am c1d8af50: am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds

* commit '38ff2b44ad7a64768cd1bb8793ec6c45e8d1e68e':
  Disregard alleged binder entities beyond parcel bounds

include/android/keycodes.h

diff --git a/include/android/keycodes.h b/include/android/keycodes.h
index 75d0ab6..268d092 100644
--- a/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@ -302,7 +302,16 @@
     AKEYCODE_TV_CONTENTS_MENU = 256,
     AKEYCODE_TV_MEDIA_CONTEXT_MENU = 257,
     AKEYCODE_TV_TIMER_PROGRAMMING = 258,
-    AKEYCODE_HELP            = 259
+    AKEYCODE_HELP            = 259,
+    /** Primary stem key for Wear
+     * Main power/reset button on watch. */
+    AKEYCODE_STEM_PRIMARY = 264,
+    /** Generic stem key 1 for Wear */
+    AKEYCODE_STEM_1 = 265,
+    /** Generic stem key 2 for Wear */
+    AKEYCODE_STEM_2 = 266,
+    /** Generic stem key 3 for Wear */
+    AKEYCODE_STEM_3 = 267
 
     // NOTE: If you add a new keycode here you must also add it to several other files.
     //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

include/input/InputEventLabels.h

diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h
index 9aa7425..8a339f7 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -299,6 +299,10 @@
     DEFINE_KEYCODE(TV_MEDIA_CONTEXT_MENU),
     DEFINE_KEYCODE(TV_TIMER_PROGRAMMING),
     DEFINE_KEYCODE(HELP),
+    DEFINE_KEYCODE(STEM_PRIMARY),
+    DEFINE_KEYCODE(STEM_1),
+    DEFINE_KEYCODE(STEM_2),
+    DEFINE_KEYCODE(STEM_3),
 
     { NULL, 0 }
 };