commit 81046f77481e332b854787fb7632973cb9b36332
author Chih-Hung Hsieh <chh@google.com> Mon Oct 09 19:45:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 09 19:45:38 2017 +0000
tree 0901486dab7c1bce72962381e5f1a69629b13058
parent c4e2e549dfb337d42385e533501ba01bcdf56ef1
parent 3b225d1274dda18ec3e566599f98d62acc804125

Merge "Use -Werror in frameworks/native/services" am: 9099430db7
am: 3b225d1274

Change-Id: I5afe360f1b7b3537c25a503fc2bb452f9a531933

include/android/keycodes.h

diff --git a/include/android/keycodes.h b/include/android/keycodes.h
index e202060..2164d61 100644
--- a/include/android/keycodes.h
+++ b/include/android/keycodes.h
@@ -765,7 +765,9 @@
     /** fingerprint navigation key, left. */
     AKEYCODE_SYSTEM_NAVIGATION_LEFT = 282,
     /** fingerprint navigation key, right. */
-    AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283
+    AKEYCODE_SYSTEM_NAVIGATION_RIGHT = 283,
+    /** all apps */
+    AKEYCODE_ALL_APPS = 284
 
     // 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 20154eb..c282cf0 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -323,6 +323,7 @@
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_DOWN),
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_LEFT),
     DEFINE_KEYCODE(SYSTEM_NAVIGATION_RIGHT),
+    DEFINE_KEYCODE(ALL_APPS),
 
     { NULL, 0 }
 };