summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Komsiyski <vladokom@google.com> 2023-01-10 16:42:11 +0100
committer Vladimir Komsiyski <vladokom@google.com> 2023-01-10 16:42:11 +0100
commit9f10c61506986c86d248dfed6591c0f69301847d (patch)
treecd84369f43c35c34383103279d9b61def62e19a0
parent901d619f1594e812f5d58601a56773ebee55e9ee (diff)
Native support for sending KEYCODE_BACK from a VirtualDpad.
The keycode was added to VirtualDpad but the native InputController was not changed accordingly. Bug: 233911853 Test: n/a Change-Id: Iba90e3d88335ec2c184a4c08a645a3d686081ea0
-rw-r--r--services/core/jni/com_android_server_companion_virtual_InputController.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/jni/com_android_server_companion_virtual_InputController.cpp b/services/core/jni/com_android_server_companion_virtual_InputController.cpp
index b7a4fd1be261..4cb7a8fc04de 100644
--- a/services/core/jni/com_android_server_companion_virtual_InputController.cpp
+++ b/services/core/jni/com_android_server_companion_virtual_InputController.cpp
@@ -81,7 +81,7 @@ static std::map<int, int> TOOL_TYPE_MAPPING = {
static std::map<int, int> DPAD_KEY_CODE_MAPPING = {
{AKEYCODE_DPAD_DOWN, KEY_DOWN}, {AKEYCODE_DPAD_UP, KEY_UP},
{AKEYCODE_DPAD_LEFT, KEY_LEFT}, {AKEYCODE_DPAD_RIGHT, KEY_RIGHT},
- {AKEYCODE_DPAD_CENTER, KEY_SELECT},
+ {AKEYCODE_DPAD_CENTER, KEY_SELECT}, {AKEYCODE_BACK, KEY_BACK},
};
// Keycode mapping from https://source.android.com/devices/input/keyboard-devices
@@ -378,7 +378,7 @@ static bool writeKeyEvent(jint fd, jint androidKeyCode, jint action,
const std::map<int, int>& keyCodeMapping) {
auto keyCodeIterator = keyCodeMapping.find(androidKeyCode);
if (keyCodeIterator == keyCodeMapping.end()) {
- ALOGE("No supportive native keycode for androidKeyCode %d", androidKeyCode);
+ ALOGE("Unsupported native keycode for androidKeyCode %d", androidKeyCode);
return false;
}
auto actionIterator = KEY_ACTION_MAPPING.find(action);
@@ -512,4 +512,4 @@ int register_android_server_companion_virtual_InputController(JNIEnv* env) {
methods, NELEM(methods));
}
-} // namespace android \ No newline at end of file
+} // namespace android