diff options
| author | 2023-09-13 23:04:25 +0000 | |
|---|---|---|
| committer | 2023-09-13 23:04:25 +0000 | |
| commit | 834467bdcc1a799ece112553070593bbd4940455 (patch) | |
| tree | ff090d8a29609368f294044451100befff6ce5eb /tools/validatekeymaps/Main.cpp | |
| parent | 36a4442577e66659f9769c32b52315cec4a4acf6 (diff) | |
| parent | d001ea5b7242f110530e339d479b28b29dadc242 (diff) | |
Merge "Don't depend on String8 cast to C string" into main am: 41363ba9fc am: d001ea5b72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748044
Change-Id: Icc8df7b364fcda5e6cc734bdbef49e2d7dc43b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/validatekeymaps/Main.cpp')
| -rw-r--r-- | tools/validatekeymaps/Main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp index 0fa13b81c4ea..70d875e394ff 100644 --- a/tools/validatekeymaps/Main.cpp +++ b/tools/validatekeymaps/Main.cpp @@ -165,7 +165,7 @@ static bool validateFile(const char* filename) { case FileType::INPUT_DEVICE_CONFIGURATION: { android::base::Result<std::unique_ptr<PropertyMap>> propertyMap = - PropertyMap::load(String8(filename)); + PropertyMap::load(String8(filename).c_str()); if (!propertyMap.ok()) { error("Error parsing input device configuration file: %s.\n\n", propertyMap.error().message().c_str()); |