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

Commit 546bbb0a authored by Ryan Prichard's avatar Ryan Prichard Committed by Android (Google) Code Review
Browse files

Merge "Move Theme::Entry definition to top of file" into aosp-main-future

parents 0e4bad82 3899b442

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() {

  memset(&configuration_, 0, sizeof(configuration_));

}
@@ -1434,12 +1440,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");