summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hongguang Chen <hgchen@google.com> 2024-12-20 12:01:24 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2024-12-20 12:01:24 -0800
commitd676d13dac9b7cea1c36f65dff6716c86c3d015e (patch)
tree75f78c642cc1916008f9e0280851b9a976a5f521
parent8117ad1d36639f422b87f8c91b2279544d81e97f (diff)
parentf5cd4a37a6422432a3ae2db6bfa16864a4e657de (diff)
Merge "Add AKEY mapping to allow injecting KEYCODE_TV_INPUT, KEYCODE_PERIOD, KEYCODE_TV_AUDIO_DESCRIPTION from onscreen remote" into main
-rw-r--r--services/core/jni/com_android_server_tv_TvKeys.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/jni/com_android_server_tv_TvKeys.h b/services/core/jni/com_android_server_tv_TvKeys.h
index b3ee263190c6..babdb4ccac94 100644
--- a/services/core/jni/com_android_server_tv_TvKeys.h
+++ b/services/core/jni/com_android_server_tv_TvKeys.h
@@ -91,8 +91,11 @@ static Key KEYS[] = {
{KEY_TEXT, AKEYCODE_TV_TELETEXT},
{KEY_SUBTITLE, AKEYCODE_CAPTIONS},
{KEY_PVR, AKEYCODE_DVR},
+ {KEY_VIDEO, AKEYCODE_TV_INPUT},
{KEY_AUDIO, AKEYCODE_MEDIA_AUDIO_TRACK},
+ {KEY_AUDIO_DESC, AKEYCODE_TV_AUDIO_DESCRIPTION},
{KEY_OPTION, AKEYCODE_SETTINGS},
+ {KEY_DOT, AKEYCODE_PERIOD},
// Gamepad buttons
{KEY_UP, AKEYCODE_DPAD_UP},