diff options
| author | 2023-08-30 21:00:42 +0000 | |
|---|---|---|
| committer | 2023-08-30 21:00:42 +0000 | |
| commit | 2367dc86d75fdc17a080452d4d010df494a173f7 (patch) | |
| tree | 5e11669d608495a2a1dc56bfd0b8d85b3088f2ab /tools/aapt2 | |
| parent | da845a7d94ece6a42dc3a10ba8d13f9a3abeb71c (diff) | |
| parent | 76eed81379afcec865cedeb7025738b3e6a39600 (diff) | |
Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465" into udc-dev am: 76eed81379
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24029253
Change-Id: Iaf115294769ed324edea503e66172fd8dd955eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2')
| -rw-r--r-- | tools/aapt2/process/SymbolTable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/aapt2/process/SymbolTable.cpp b/tools/aapt2/process/SymbolTable.cpp index b75458a7b8b6..d78baf9ffeb4 100644 --- a/tools/aapt2/process/SymbolTable.cpp +++ b/tools/aapt2/process/SymbolTable.cpp @@ -260,10 +260,11 @@ bool AssetManagerSymbolSource::IsPackageDynamic(uint32_t packageId, static std::unique_ptr<SymbolTable::Symbol> LookupAttributeInTable( android::AssetManager2& am, ResourceId id) { using namespace android; - if (am.GetApkAssets().empty()) { + if (am.GetApkAssetsCount() == 0) { return {}; } + auto op = am.StartOperation(); auto bag_result = am.GetBag(id.id); if (!bag_result.has_value()) { return nullptr; |