Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add explicit Result::ok() where missing

Browse Source 
This is part of a large-scale cleanup to remove operator bool() from
android::base::expected. For more details, see aosp/1533001.

Bug: 176148206
Test: m checkbuild continuous_instrumentation_tests continuous_instrumentation_tests_api_coverage continuous_native_tests device-tests platform_tests
Exempt-From-Owner-Approval: mechanical large-scale change
Change-Id: Ie8cf279c20c9284ad6476280e80dc25545f833de
This commit is contained in:
Bernie Innocenti
2020-12-22 20:10:32 +09:00
parent 465c67dfd5
commit fbc9afb084
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/validatekeymaps/Main.cpp
View File

@@ -96,7 +96,7 @@ static bool validateFile(const char* filename) {
case FileType::KEY_LAYOUT: {
base::Result<std::shared_ptr<KeyLayoutMap>> ret = KeyLayoutMap::load(filename);
if (!ret) {
if (!ret.ok()) {
error("Error %s parsing key layout file.\n\n", ret.error().message().c_str());
return false;
}
@@ -106,7 +106,7 @@ static bool validateFile(const char* filename) {
case FileType::KEY_CHARACTER_MAP: {
base::Result<std::shared_ptr<KeyCharacterMap>> ret =
KeyCharacterMap::load(filename, KeyCharacterMap::Format::ANY);
if (!ret) {
if (!ret.ok()) {
error("Error %s parsing key character map file.\n\n",
ret.error().message().c_str());
return false;