commit d02ea10ecdc76dd41c9738659682a3fc621ba940
author Harry Cutts <hcutts@google.com> Fri Mar 17 18:21:30 2023 +0000
committer Harry Cutts <hcutts@google.com> Fri Mar 17 18:24:52 2023 +0000
tree cc41c83fdc9649d12b90ab1568a0b94ae2b7026c
parent 8cd2abde80d7a508646c13c814b7cae91b3161f1

InputMapper: use a reference for InputDeviceInfo parameter

This makes the code a bit safer, especially since we never check for
this parameter being null.

Bug: 245989146
Test: atest inputflinger_tests
Test: dump motion ranges from a test app, check they're still there
Change-Id: I2754e57c8b261f86ad69891098c9762b96e9ec55

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
index f39e004..269c106 100644
--- a/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/KeyboardInputMapper.cpp
@@ -85,18 +85,18 @@
     return ADISPLAY_ID_NONE;
 }
 
-void KeyboardInputMapper::populateDeviceInfo(InputDeviceInfo* info) {
+void KeyboardInputMapper::populateDeviceInfo(InputDeviceInfo& info) {
     InputMapper::populateDeviceInfo(info);
 
-    info->setKeyboardType(mKeyboardType);
-    info->setKeyCharacterMap(getDeviceContext().getKeyCharacterMap());
+    info.setKeyboardType(mKeyboardType);
+    info.setKeyCharacterMap(getDeviceContext().getKeyCharacterMap());
 
     if (mKeyboardLayoutInfo) {
-        info->setKeyboardLayoutInfo(*mKeyboardLayoutInfo);
+        info.setKeyboardLayoutInfo(*mKeyboardLayoutInfo);
     } else {
         std::optional<RawLayoutInfo> layoutInfo = getDeviceContext().getRawLayoutInfo();
         if (layoutInfo) {
-            info->setKeyboardLayoutInfo(
+            info.setKeyboardLayoutInfo(
                     KeyboardLayoutInfo(layoutInfo->languageTag, layoutInfo->layoutType));
         }
     }