commit cc6ff3876e395040748627353b7384e49d90e4f9
author Jeremy Meyer <jakmcbane@google.com> Mon Jul 10 17:06:52 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 10 17:06:52 2023 +0000
tree 75c6a80063d354c15715c200b0bc11d45a99725a
parent 09158c693f2e29bf0a3403355b32ba8750977113

Revert "Pass all preferred locales to AssetManager"

This reverts commit 09158c693f2e29bf0a3403355b32ba8750977113.

Reason for revert: causes test failures
Fixes: 290377322
Fixes: 290377794
Fixes: 290377713

Change-Id: I69b6fe1e1ce597656ff80ccd4446f12c76ffc19b

libs/androidfw/tests/AssetManager2_bench.cpp

diff --git a/libs/androidfw/tests/AssetManager2_bench.cpp b/libs/androidfw/tests/AssetManager2_bench.cpp
index 2caa98c..6fae72a 100644
--- a/libs/androidfw/tests/AssetManager2_bench.cpp
+++ b/libs/androidfw/tests/AssetManager2_bench.cpp
@@ -228,12 +228,10 @@
 
   ResTable_config config;
   memset(&config, 0, sizeof(config));
-  std::vector<ResTable_config> configs;
-  configs.push_back(config);
 
   while (state.KeepRunning()) {
-    configs[0].sdkVersion = ~configs[0].sdkVersion;
-    assets.SetConfigurations(configs);
+    config.sdkVersion = ~config.sdkVersion;
+    assets.SetConfiguration(config);
   }
 }
 BENCHMARK(BM_AssetManagerSetConfigurationFramework);