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

Commit ef32fcdc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[res] Remove unused fields from ResolvedBag::Entry" into main

parents 438151b5 4204774f

libs/androidfw/AssetManager2.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1300,8 +1300,6 @@ base::expected<const ResolvedBag*, NullOrIOError> AssetManager2::GetBag( 


      new_entry->cookie = entry->cookie;

      new_entry->key = new_key;

      new_entry->key_pool = nullptr;

      new_entry->type_pool = nullptr;

      new_entry->style = resid;

      new_entry->value.copyFrom_dtoh(map_entry->value);

      status_t err = entry->dynamic_ref_table->lookupResourceValue(&new_entry->value);
@@ -1372,8 +1370,6 @@ base::expected<const ResolvedBag*, NullOrIOError> AssetManager2::GetBag( 
      // or is equal to the parent (overrides).

      new_entry->cookie = entry->cookie;

      new_entry->key = child_key;

      new_entry->key_pool = nullptr;

      new_entry->type_pool = nullptr;

      new_entry->value.copyFrom_dtoh(map_entry->value);

      new_entry->style = resid;

      status_t err = entry->dynamic_ref_table->lookupResourceValue(&new_entry->value);
@@ -1415,8 +1411,6 @@ base::expected<const ResolvedBag*, NullOrIOError> AssetManager2::GetBag( 
    }

    new_entry->cookie = entry->cookie;

    new_entry->key = new_key;

    new_entry->key_pool = nullptr;

    new_entry->type_pool = nullptr;

    new_entry->value.copyFrom_dtoh(map_entry->value);

    new_entry->style = resid;

    status_t err = entry->dynamic_ref_table->lookupResourceValue(&new_entry->value);

libs/androidfw/include/androidfw/AssetManager2.h

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ struct ResolvedBag { 


    // Which ApkAssets this entry came from.

    ApkAssetsCookie cookie;



    ResStringPool* key_pool;

    ResStringPool* type_pool;

  };



  // Denotes the configuration axis that this bag varies with.