summaryrefslogtreecommitdiff
path: root/tools/validatekeymaps/Main.cpp
diff options
context:
space:
mode:
authorSiarhei Vishniakou <svv@google.com>2020-09-08 22:43:35 -0500
committerSiarhei Vishniakou <svv@google.com>2020-09-18 16:29:17 -0500
commit2da17761f9545b9427a1bc4ef8b2ecf3a337b950 (patch)
treef9931269c3240731f12c7d931ef78b6b979e8f18 /tools/validatekeymaps/Main.cpp
parenta67b86d081f6b6c824f03b5a5c9aff12d84f9cd0 (diff)
Update usage of PropertyMap::load
Now that PropertyMap returns an owned object, update the usage in validatekeymaps. Bug: 163171599 Test: presubmit Change-Id: I75b9abe3fa1d418951a8c23a624771046a89b3f8
Diffstat (limited to 'tools/validatekeymaps/Main.cpp')
-rw-r--r--tools/validatekeymaps/Main.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp
index 7c150f9c8db9..0af6266d1642 100644
--- a/tools/validatekeymaps/Main.cpp
+++ b/tools/validatekeymaps/Main.cpp
@@ -115,13 +115,13 @@ static bool validateFile(const char* filename) {
}
case FILETYPE_INPUTDEVICECONFIGURATION: {
- PropertyMap* map;
- status_t status = PropertyMap::load(String8(filename), &map);
- if (status) {
- error("Error %d parsing input device configuration file.\n\n", status);
+ android::base::Result<std::unique_ptr<PropertyMap>> propertyMap =
+ PropertyMap::load(String8(filename));
+ if (!propertyMap.ok()) {
+ error("Error %d parsing input device configuration file.\n\n",
+ propertyMap.error().code());
return false;
}
- delete map;
break;
}