Copy KeyCharacterMap object when we fill InputDeviceInfo(1/n)

Currently, in InputDeviceInfo, we store the KeyCharacterMap object,
which is actually the original KeyCharacterMap from the EventHub. This
could potentially lead to issues where two threads operate on the same
KeyCharacterMap object simultaneously, resulting in thread safety
problems.

To avoid potential risks in the future, we make a copy of the original
KeyCharacterMap when generating InputDeviceInfo.

This change should not introduce any behavioral changes.

Bug: 373011069
Flag: EXEMPT refactor
Test: presubmit

Signed-off-by: Linnan Li <lilinnan@xiaomi.corp-partner.google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:1be9c1ce7400e38cf3f45921d7181e947929f91c)
Merged-In: I0d0155133f95b0f1dc925422eda0da04c6f196ea
Change-Id: I0d0155133f95b0f1dc925422eda0da04c6f196ea

1 files changed, 3 insertions, 3 deletions

diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp
index d775327a80..90d29dd190 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -84,15 +84,15 @@ static String8 toString(const char16_t* chars, size_t numChars) {
 
 KeyCharacterMap::KeyCharacterMap(const std::string& filename) : mLoadFileName(filename) {}
 
-base::Result<std::shared_ptr<KeyCharacterMap>> KeyCharacterMap::load(const std::string& filename,
+base::Result<std::unique_ptr<KeyCharacterMap>> KeyCharacterMap::load(const std::string& filename,
                                                                      Format format) {
     Tokenizer* tokenizer;
     status_t status = Tokenizer::open(String8(filename.c_str()), &tokenizer);
     if (status) {
         return Errorf("Error {} opening key character map file {}.", status, filename.c_str());
     }
-    std::shared_ptr<KeyCharacterMap> map =
-            std::shared_ptr<KeyCharacterMap>(new KeyCharacterMap(filename));
+    std::unique_ptr<KeyCharacterMap> map =
+            std::unique_ptr<KeyCharacterMap>(new KeyCharacterMap(filename));
     if (!map.get()) {
         ALOGE("Error allocating key character map.");
         return Errorf("Error allocating key character map.");