Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f24b09dd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "libafw: Use std::free explicitly for overlays" into rvc-dev am:... 

Merge "Merge "libafw: Use std::free explicitly for overlays" into rvc-dev am: 5dc36b2f am: aec9e504" into rvc-d1-dev-plus-aosp am: 68cf3850 am: cd274e09

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11959160

Change-Id: I481871cd4cd788739360fe53c4d7d0f947cfbd35
parents 0ee4d287 cd274e09

libs/androidfw/Idmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {

libs/androidfw/include/androidfw/ResourceTypes.h

+2 −2
Original line number Diff line number Diff line
@@ -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)  {