diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2019-11-11 13:46:06 -0800 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@google.com> | 2019-11-11 13:46:06 -0800 |
| commit | f7532d16f99dc9cf60408637667bcd41df49e81d (patch) | |
| tree | e6e7035acea9c6e930e51d4c7571463cf4ac5188 /tools | |
| parent | 812170edaceec195a67aa4e80f6e8179c9da3ac3 (diff) | |
| download | platform_packages_services_Car-f7532d16f99dc9cf60408637667bcd41df49e81d.tar.gz platform_packages_services_Car-f7532d16f99dc9cf60408637667bcd41df49e81d.tar.bz2 platform_packages_services_Car-f7532d16f99dc9cf60408637667bcd41df49e81d.zip | |
packages: services: Car: fix -Wreturn-stack-address
The string view is a view (ie. address) into a temporary stack local
variable. Return a std::string to implicitly construct a new std::string
that isn't dangling.
Bug: 139945549
Bug: 144303356
Change-Id: I512ba7a7104ec952052f0f2cfc7d841e6cc5d73a
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/keventreader/server/keymap.cpp | 2 | ||||
| -rw-r--r-- | tools/keventreader/server/keymap.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/keventreader/server/keymap.cpp b/tools/keventreader/server/keymap.cpp index 2e7c06d5b..5a86ff12d 100644 --- a/tools/keventreader/server/keymap.cpp +++ b/tools/keventreader/server/keymap.cpp @@ -28,7 +28,7 @@ Keymap::Keymap() { fillMap(); } -std::string_view Keymap::getDisplayName(int keycode) { +std::string Keymap::getDisplayName(int keycode) { auto iter = mKeyMap.find(keycode), end = mKeyMap.end(); if (iter == end) { std::stringstream ss; diff --git a/tools/keventreader/server/keymap.h b/tools/keventreader/server/keymap.h index 28f68d609..86ec4d518 100644 --- a/tools/keventreader/server/keymap.h +++ b/tools/keventreader/server/keymap.h @@ -25,7 +25,7 @@ namespace com::android::car::keventreader { public: static Keymap& get(); - std::string_view getDisplayName(int keycode); + std::string getDisplayName(int keycode); private: std::map<int, const char*> mKeyMap; |
