commit 58cf8e3ffa23752f4e8e38cab4d89f9b44f9e57a
author Bernie Innocenti <codewiz@google.com> Sat Dec 19 15:31:52 2020 +0900
committer Bernie Innocenti <codewiz@google.com> Mon Dec 21 15:50:57 2020 +0000
tree 3cc4048865054e95a9bf72a5a50fe19c8e849c29
parent 96db3dad2a4a1c4f1622a2b268b347cda0e808db

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: I3117833c51cdb333cccdfd159d1582f2adef77db

libs/androidfw/AssetManager2.cpp

diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp
index a545b3d..bec80a7 100644
--- a/libs/androidfw/AssetManager2.cpp
+++ b/libs/androidfw/AssetManager2.cpp
@@ -670,7 +670,7 @@
     }
 
     auto entry_flags = type_spec->GetFlagsForEntryIndex(entry_idx);
-    if (UNLIKELY(!entry_flags)) {
+    if (UNLIKELY(!entry_flags.has_value())) {
       return base::unexpected(entry_flags.error());
     }
     type_flags |= entry_flags.value();