diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 00:43:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 00:43:07 +0000 |
| commit | 5d80a03bb85057fc475b2752cf1acbf8b29a2577 (patch) | |
| tree | b7b9a54aa5f307e2b4e2a0e1cb0fbfbfeaedd375 /libs/androidfw/include | |
| parent | 5c60ef42057ab58a87f320748967bc85b5bf7fb1 (diff) | |
| parent | 5dc36b2f9d7150b1c417898ca77e49c020b90657 (diff) | |
Merge "libafw: Use std::free explicitly for overlays" into rvc-dev am: 5dc36b2f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11959160
Change-Id: Id5877c6ff2a1b956aeba509ddf01213324621341
Diffstat (limited to 'libs/androidfw/include')
| -rw-r--r-- | libs/androidfw/include/androidfw/ResourceTypes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/include/androidfw/ResourceTypes.h b/libs/androidfw/include/androidfw/ResourceTypes.h index 21be81cb85bd..e351a46d633a 100644 --- a/libs/androidfw/include/androidfw/ResourceTypes.h +++ b/libs/androidfw/include/androidfw/ResourceTypes.h @@ -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) { |