summaryrefslogtreecommitdiff
path: root/libs/input/KeyCharacterMap.cpp
diff options
context:
space:
mode:
author Bernie Innocenti <codewiz@google.com> 2020-12-21 12:50:14 +0900
committer Bernie Innocenti <codewiz@google.com> 2020-12-21 12:50:14 +0900
commit9c27af55a9894911968eaf182f7888e80b9637a0 (patch)
treeceb074ff0a9642560836684c4eb9738d36396b65 /libs/input/KeyCharacterMap.cpp
parentb8c9fff2aa4b8c73e2be89f6f5adfd1b1b9747b6 (diff)
Add explicit Result::ok() checks where needed
Test: m checkbuild continuous_instrumentation_tests continuous_instrumentation_tests_api_coverage continuous_native_tests device-tests platform_tests Exempt-From-Owner-Approval: mechanical mass refactoring Change-Id: I698a6843686810527d753d075f543f1d6e1eb1f4
Diffstat (limited to 'libs/input/KeyCharacterMap.cpp')
-rw-r--r--libs/input/KeyCharacterMap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp
index 5666de6624..44f3f34994 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -154,7 +154,7 @@ base::Result<std::shared_ptr<KeyCharacterMap>> KeyCharacterMap::load(const std::
}
std::unique_ptr<Tokenizer> t(tokenizer);
auto ret = load(t.get(), format);
- if (ret) {
+ if (ret.ok()) {
(*ret)->mLoadFileName = filename;
}
return ret;
@@ -170,7 +170,7 @@ base::Result<std::shared_ptr<KeyCharacterMap>> KeyCharacterMap::loadContents(
}
std::unique_ptr<Tokenizer> t(tokenizer);
auto ret = load(t.get(), format);
- if (ret) {
+ if (ret.ok()) {
(*ret)->mLoadFileName = filename;
}
return ret;