diff options
| author | 2020-12-21 19:20:02 +0000 | |
|---|---|---|
| committer | 2020-12-21 19:20:02 +0000 | |
| commit | f454301ae66fd7dcdba4017c6a6a71253a108dd8 (patch) | |
| tree | b1925e80e919c1f9ad5c798b0ea04cf7f23096f2 /libs/androidfw/AssetManager2.cpp | |
| parent | 5d1279f2bc5e05224d41b3376d52c6065facd97f (diff) | |
| parent | ae613dd6c48eb361c11c29e9ee84c7177996af1a (diff) | |
Merge "Add explicit Result::ok() checks where needed" am: c08d3ef8a8 am: ae613dd6c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibcaf3ee7efc4d1f73411fb5d4ce329bfbb9f5a63
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index a545b3d5e134..bec80a7d605e 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -670,7 +670,7 @@ base::expected<FindEntryResult, NullOrIOError> AssetManager2::FindEntryInternal( } 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(); |