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

Commit f36b4568 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "Move Theme::Entry definition to top of file" into udc-dev-plus-aosp am:... 

Merge "Move Theme::Entry definition to top of file" into udc-dev-plus-aosp am: 81a7cf81 am: 378bdf9f

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



Change-Id: I25b8ca93525e5833f6f17fa1d709a71a2a02366f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47448a63 378bdf9f

libs/androidfw/AssetManager2.cpp

+6 −6
Original line number Diff line number Diff line
@@ -91,6 +91,12 @@ struct FindEntryResult { 
  StringPoolRef entry_string_ref;

};



struct Theme::Entry {

  ApkAssetsCookie cookie;

  uint32_t type_spec_flags;

  Res_value value;

};



AssetManager2::AssetManager2(ApkAssetsList apk_assets, const ResTable_config& configuration)

    : configuration_(configuration) {

  // Don't invalidate caches here as there's nothing cached yet.
@@ -1523,12 +1529,6 @@ Theme::Theme(AssetManager2* asset_manager) : asset_manager_(asset_manager) { 


Theme::~Theme() = default;



struct Theme::Entry {

  ApkAssetsCookie cookie;

  uint32_t type_spec_flags;

  Res_value value;

};



base::expected<std::monostate, NullOrIOError> Theme::ApplyStyle(uint32_t resid, bool force) {

  ATRACE_NAME("Theme::ApplyStyle");