Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "libafw: Use std::free explicitly for overlays" into rvc-dev am: 5dc36b2f9d am: aec9e504c0" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-06-23 01:05:31 +00:00
committed by Android (Google) Code Review
parent e108bd5895 dcd0e5f6f7
commit 68cf3850d2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/androidfw/Idmap.cpp
View File

@@ -157,7 +157,7 @@ IdmapResMap::Result IdmapResMap::Lookup(uint32_t target_res_id) const {
table_value->dataType = entry->type;
table_value->data = entry->value;
return Result(ResTable_entry_handle::managed(table_entry));
return Result(ResTable_entry_handle::managed(table_entry, [](auto p) { free(p); }));
}
static bool is_word_aligned(const void* data) {

4
libs/androidfw/include/androidfw/ResourceTypes.h
View File

@@ -1601,8 +1601,8 @@ class ResTable_entry_handle {
entry_ = handle.entry_;
}
inline static ResTable_entry_handle managed(ResTable_entry* entry) {
return ResTable_entry_handle(std::shared_ptr<const ResTable_entry>(entry));
inline static ResTable_entry_handle managed(ResTable_entry* entry, void (*deleter)(void *)) {
return ResTable_entry_handle(std::shared_ptr<const ResTable_entry>(entry, deleter));
}
inline static ResTable_entry_handle unmanaged(const ResTable_entry* entry) {