summaryrefslogtreecommitdiff
path: root/native/android/configuration.cpp
diff options
context:
space:
mode:
author Jeremy Meyer <jakmcbane@google.com> 2023-07-10 17:06:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-07-10 17:06:52 +0000
commitcc6ff3876e395040748627353b7384e49d90e4f9 (patch)
tree75c6a80063d354c15715c200b0bc11d45a99725a /native/android/configuration.cpp
parent09158c693f2e29bf0a3403355b32ba8750977113 (diff)
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
Diffstat (limited to 'native/android/configuration.cpp')
-rw-r--r--native/android/configuration.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/native/android/configuration.cpp b/native/android/configuration.cpp
index 283445fc8a9a..b50514d27bac 100644
--- a/native/android/configuration.cpp
+++ b/native/android/configuration.cpp
@@ -36,7 +36,7 @@ void AConfiguration_delete(AConfiguration* config) {
void AConfiguration_fromAssetManager(AConfiguration* out, AAssetManager* am) {
ScopedLock<AssetManager2> locked_mgr(*AssetManagerForNdkAssetManager(am));
- ResTable_config config = locked_mgr->GetConfigurations()[0];
+ ResTable_config config = locked_mgr->GetConfiguration();
// AConfiguration is not a virtual subclass, so we can memcpy.
memcpy(out, &config, sizeof(config));