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

Merge "Add explicit Result::ok() where missing"

Browse Source
This commit is contained in:
Bernie Innocenti
2020-12-22 15:53:59 +00:00
committed by Android (Google) Code Review
parent 7d2c5b53e2 fbc9afb084
commit f896d460d1
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;