summaryrefslogtreecommitdiff
path: root/libs/androidfw/tests/BenchmarkHelpers.cpp
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-01-23 12:58:11 -0800
committerAdam Lesinski <adamlesinski@google.com>2018-01-09 16:28:58 -0800
commitb20a0ce59f59cb5ec857748e056cc341dbd13b92 (patch)
tree6e28d25ea0dbe435b9bcc607827b7c1832f7c79f /libs/androidfw/tests/BenchmarkHelpers.cpp
parentd6808dc0c00ba45fd589449647f792daf9fa8126 (diff)
Replace AssetManager with AssetManager2 implementation
Test: Existing CTS tests pass Test: make libandroidfw_tests Change-Id: I858f7e1d909c08273b096601136e3f28e15eb5d4
Diffstat (limited to 'libs/androidfw/tests/BenchmarkHelpers.cpp')
-rw-r--r--libs/androidfw/tests/BenchmarkHelpers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/tests/BenchmarkHelpers.cpp b/libs/androidfw/tests/BenchmarkHelpers.cpp
index 7149beef797f..a8abcb5df86c 100644
--- a/libs/androidfw/tests/BenchmarkHelpers.cpp
+++ b/libs/androidfw/tests/BenchmarkHelpers.cpp
@@ -33,12 +33,12 @@ void GetResourceBenchmarkOld(const std::vector<std::string>& paths, const ResTab
}
}
+ // Make sure to force creation of the ResTable first, or else the configuration doesn't get set.
+ const ResTable& table = assetmanager.getResources(true);
if (config != nullptr) {
assetmanager.setConfiguration(*config);
}
- const ResTable& table = assetmanager.getResources(true);
-
Res_value value;
ResTable_config selected_config;
uint32_t flags;