android 10
遥控器新增自定义键值
diff --git a/common/android/bionic/libc/kernel/uapi/linux/input-event-codes.h b/common/android/bionic/libc/kernel/uapi/linux/input-event-codes.h
index 41da8ce0..2b103120 100644
--- a/common/android/bionic/libc/kernel/uapi/linux/input-event-codes.h
+++ b/common/android/bionic/libc/kernel/uapi/linux/input-event-codes.h
@@ -611,6 +611,8 @@
#define BTN_TRIGGER_HAPPY40 0x2e7
+#define KEY_XXX_PAGE_UP 0x2ea
+#define KEY_XXX_PAGE_DOWN 0x2eb
#define KEY_MIN_INTERESTING KEY_MUTE
#define KEY_MAX 0x2ff
#define KEY_CNT (KEY_MAX + 1)
diff --git a/common/android/external/kernel-headers/original/uapi/linux/input-event-codes.h b/common/android/external/kernel-headers/original/uapi/linux/input-event-codes.h
index 9c325d4e..909a3345 100644
--- a/common/android/external/kernel-headers/original/uapi/linux/input-event-codes.h
+++ b/common/android/external/kernel-headers/original/uapi/linux/input-event-codes.h
@@ -690,6 +690,8 @@
#define BTN_TRIGGER_HAPPY40 0x2e7
+#define KEY_XXX_PAGE_UP 0x2ea
+#define KEY_XXX_PAGE_DOWN 0x2eb
/* We avoid low common keys in module aliases so they don't get huge. */
#define KEY_MIN_INTERESTING KEY_MUTE
diff --git a/common/android/frameworks/base/api/current.txt b/common/android/frameworks/base/api/current.txt
index 27a37470..82bdb44b 100755
--- a/common/android/frameworks/base/api/current.txt
+++ b/common/android/frameworks/base/api/current.txt
@@ -49493,6 +49493,8 @@ package android.view {
+ field public static final int KEYCODE_XXX_PAGE_DOWN = 293; // 0x125
+ field public static final int KEYCODE_XXX_PAGE_UP = 292; // 0x124
field public static final int KEYCODE_SLASH = 76; // 0x4c
diff --git a/common/android/frameworks/base/core/java/android/view/KeyEvent.java b/common/android/frameworks/base/core/java/android/view/KeyEvent.java
index 0d832758..810fa644 100644
--- a/common/android/frameworks/base/core/java/android/view/KeyEvent.java
+++ b/common/android/frameworks/base/core/java/android/view/KeyEvent.java
@@ -829,6 +829,8 @@ public class KeyEvent extends InputEvent implements Parcelable {
+ public static final int KEYCODE_XXX_PAGE_UP = 292;
+ public static final int KEYCODE_XXX_PAGE_DOWN = 293;
/* add for other platform, Reserved for them */
diff --git a/common/android/frameworks/base/data/keyboards/Generic.kl b/common/android/frameworks/base/data/keyboards/Generic.kl
index 61ac29a3..aa2c1d4b 100644
--- a/common/android/frameworks/base/data/keyboards/Generic.kl
+++ b/common/android/frameworks/base/data/keyboards/Generic.kl
@@ -375,6 +375,9 @@ key 429 CONTACTS
+key 746 XXX_PAGE_UP
+key 747 XXX_PAGE_DOWN
+
diff --git a/common/android/frameworks/base/services/core/jni/com_android_server_tv_TvKeys.h b/common/android/frameworks/base/services/core/jni/com_android_server_tv_TvKeys.h
index 96687a5b..bf6a4507 100644
--- a/common/android/frameworks/base/services/core/jni/com_android_server_tv_TvKeys.h
+++ b/common/android/frameworks/base/services/core/jni/com_android_server_tv_TvKeys.h
@@ -110,6 +110,9 @@ static Key KEYS[] = {
+
+ { KEY_XXX_PAGE_UP, AKEYCODE_XXX_PAGE_UP },
+ { KEY_XXX_PAGE_DOWN, AKEYCODE_XXX_PAGE_DOWN },
};
} // namespace android
diff --git a/common/android/frameworks/native/include/android/keycodes.h b/common/android/frameworks/native/include/android/keycodes.h
index 6d151c37..69175714 100644
--- a/common/android/frameworks/native/include/android/keycodes.h
+++ b/common/android/frameworks/native/include/android/keycodes.h
@@ -782,6 +782,9 @@ enum {
+ AKEYCODE_XXX_PAGE_UP = 292,
+ AKEYCODE_XXX_PAGE_DOWN = 293,
+
/* add some new keys for TVD */
AKEYCODE_TV_SYSTEM = 10000,
AKEYCODE_GOTO = 10001,
diff --git a/common/android/frameworks/native/include/input/InputEventLabels.h b/common/android/frameworks/native/include/input/InputEventLabels.h
index 52766f5c..dd013f2b 100644
--- a/common/android/frameworks/native/include/input/InputEventLabels.h
+++ b/common/android/frameworks/native/include/input/InputEventLabels.h
@@ -331,6 +331,8 @@ static const InputEventLabel KEYCODES[] = {
+ DEFINE_KEYCODE(XXX_PAGE_UP),
+ DEFINE_KEYCODE(XXX_PAGE_DOWN),
DEFINE_KEYCODE(TV_SYSTEM),
DEFINE_KEYCODE(GOTO),
DEFINE_KEYCODE(SUBTITLE),
diff --git a/common/longan/kernel/linux-4.9/drivers/hid/hid-input.c b/common/longan/kernel/linux-4.9/drivers/hid/hid-input.c
index fc7ada2..8b85fc4 100644
--- a/common/longan/kernel/linux-4.9/drivers/hid/hid-input.c
+++ b/common/longan/kernel/linux-4.9/drivers/hid/hid-input.c
@@ -931,7 +938,10 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
case 0x2ca: map_key_clear(KEY_KBDINPUTASSIST_NEXTGROUP); break;
case 0x2cb: map_key_clear(KEY_KBDINPUTASSIST_ACCEPT); break;
case 0x2cc: map_key_clear(KEY_KBDINPUTASSIST_CANCEL); break;
-
+ /* xxx -- start */
+ case 0x0de: map_key_clear(KEY_XXX_PAGE_UP); break;
+ case 0x0df: map_key_clear(KEY_XXX_PAGE_DOWN); break;
+ /* xxx -- end */
default: map_key_clear(KEY_UNKNOWN);
}
break;
diff --git a/common/longan/kernel/linux-4.9/include/uapi/linux/input-event-codes.h b/common/longan/kernel/linux-4.9/include/uapi/linux/input-event-codes.h
index 47658229..bd37bff5 100644
--- a/common/longan/kernel/linux-4.9/include/uapi/linux/input-event-codes.h
+++ b/common/longan/kernel/linux-4.9/include/uapi/linux/input-event-codes.h
@@ -689,6 +689,9 @@
+#define KEY_XXX_PAGE_UP 0x2ea
+#define KEY_XXX_PAGE_DOWN 0x2eb
+
--
android 13
和android 10一样 需要注意的是 frameworks/base/core/api/test-current.txt
也需要更新
// 更新 current.txt
make update-api
//更新 test-current.txt
m test-api-stubs-docs-non-updatable-update-current-api
// 编译framework.har
make framework-minus-apex