diff options
| author | 2020-12-22 07:02:53 +0000 | |
|---|---|---|
| committer | 2020-12-22 07:02:53 +0000 | |
| commit | fbb7fe0da32896a871dd395845f1f510b075f8d5 (patch) | |
| tree | 6c236fb18f7724a25b4c5f836648df3d56b851eb /libs/androidfw/AssetManager2.cpp | |
| parent | 81860198d2c51d07aea9f697ab01ebf215610160 (diff) | |
| parent | f454301ae66fd7dcdba4017c6a6a71253a108dd8 (diff) | |
Merge "Add explicit Result::ok() checks where needed" am: c08d3ef8a8 am: ae613dd6c4 am: f454301ae6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I22f3e4f97d523bd09b898ebdf4de18114cb4c34f
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(); |