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

Commit 8a6a1772 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by android-build-merger
Browse files

Merge "Fixed resource bag retrieval infinite recursion." into pi-dev

am: 1f76cbd7

Change-Id: I0dd918f8cbf2541d70c754fc859675949a2814b7
parents 7c878a75 1f76cbd7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ const ResolvedBag* AssetManager2::GetBag(uint32_t resid) {
  const ResTable_map* const map_entry_end = map_entry + dtohl(map->count);

  uint32_t parent_resid = dtohl(map->parent.ident);
  if (parent_resid == 0) {
  if (parent_resid == 0 || parent_resid == resid) {
    // There is no parent, meaning there is nothing to inherit and we can do a simple
    // copy of the entries in the map.
    const size_t entry_count = map_entry_end - map_entry;