diff options
| author | Bernie Innocenti <codewiz@google.com> | 2020-12-22 07:02:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-22 07:02:53 +0000 |
| commit | fbb7fe0da32896a871dd395845f1f510b075f8d5 (patch) | |
| tree | 6c236fb18f7724a25b4c5f836648df3d56b851eb /tools/aapt2/util/Util.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 'tools/aapt2/util/Util.cpp')
| -rw-r--r-- | tools/aapt2/util/Util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/util/Util.cpp b/tools/aapt2/util/Util.cpp index 28330db966af..d7a8e6fe6ada 100644 --- a/tools/aapt2/util/Util.cpp +++ b/tools/aapt2/util/Util.cpp @@ -548,14 +548,14 @@ bool ExtractResFilePathParts(const StringPiece& path, StringPiece* out_prefix, } StringPiece16 GetString16(const android::ResStringPool& pool, size_t idx) { - if (auto str = pool.stringAt(idx)) { + if (auto str = pool.stringAt(idx); str.ok()) { return *str; } return StringPiece16(); } std::string GetString(const android::ResStringPool& pool, size_t idx) { - if (auto str = pool.string8At(idx)) { + if (auto str = pool.string8At(idx); str.ok()) { return ModifiedUtf8ToUtf8(str->to_string()); } return Utf16ToUtf8(GetString16(pool, idx)); |