diff options
| author | 2023-09-08 23:32:31 +0000 | |
|---|---|---|
| committer | 2023-09-08 23:32:31 +0000 | |
| commit | eaf1c10e9f26d2cf81c3c5e661078bbb2d416cb7 (patch) | |
| tree | eebd3561a6e3143e15222d2f9901d83acd75cbb1 /libs/androidfw/AssetManager2.cpp | |
| parent | 8116bce11e8ecd767668e0a4ebb66347762bfd31 (diff) | |
| parent | e8e793a340c87d650a73a29d7915f12e1dc6146b (diff) | |
Merge "[RESTRICT AUTOMERGE] Move Theme::Entry definition to top of file" into main
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager2.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp index fc9dd145dc5d..5777fb851ab5 100644 --- a/libs/androidfw/AssetManager2.cpp +++ b/libs/androidfw/AssetManager2.cpp @@ -99,6 +99,13 @@ struct FindEntryResult { StringPoolRef entry_string_ref; }; +struct Theme::Entry { + uint32_t attr_res_id; + ApkAssetsCookie cookie; + uint32_t type_spec_flags; + Res_value value; +}; + AssetManager2::AssetManager2() { memset(&configuration_, 0, sizeof(configuration_)); } @@ -1411,13 +1418,6 @@ Theme::Theme(AssetManager2* asset_manager) : asset_manager_(asset_manager) { Theme::~Theme() = default; -struct Theme::Entry { - uint32_t attr_res_id; - ApkAssetsCookie cookie; - uint32_t type_spec_flags; - Res_value value; -}; - namespace { struct ThemeEntryKeyComparer { bool operator() (const Theme::Entry& entry, uint32_t attr_res_id) const noexcept { |