summaryrefslogtreecommitdiff
path: root/libs/input/PropertyMap.cpp
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2023-08-30 21:50:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-30 21:50:25 +0000
commitbe1e4e8d23406f7c1cb8ab50af0ae2697a4f0ec0 (patch)
treea59c5dffd74845eba2d059d55bfcd65af45af05e /libs/input/PropertyMap.cpp
parent1f5a0633594bc1e5a321f0057b9fba3d5fcd849a (diff)
parent19bcc3a5810fb1c5c0b4f864798d802ac052d24b (diff)
Merge "Use String8/16 c_str [aosp-main-future]" into aosp-main-future am: 19bcc3a581
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24606011 Change-Id: I3f90ab4c635c1f2c3ee505cf96a29118c57b6e35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/PropertyMap.cpp')
-rw-r--r--libs/input/PropertyMap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/PropertyMap.cpp b/libs/input/PropertyMap.cpp
index db0c98fc91..5f6f9e26b6 100644
--- a/libs/input/PropertyMap.cpp
+++ b/libs/input/PropertyMap.cpp
@@ -200,13 +200,13 @@ status_t PropertyMap::Parser::parse() {
return BAD_VALUE;
}
- if (mMap->hasProperty(keyToken.string())) {
+ if (mMap->hasProperty(keyToken.c_str())) {
ALOGE("%s: Duplicate property value for key '%s'.",
mTokenizer->getLocation().c_str(), keyToken.c_str());
return BAD_VALUE;
}
- mMap->addProperty(keyToken.string(), valueToken.string());
+ mMap->addProperty(keyToken.c_str(), valueToken.c_str());
}
mTokenizer->nextLine();