commit 09158c693f2e29bf0a3403355b32ba8750977113
author Jeremy Meyer <jakmcbane@google.com> Thu Mar 23 17:17:15 2023 +0000
committer Jeremy Meyer <jakmcbane@google.com> Wed Jul 05 23:23:19 2023 +0000
tree 3a41d5219ee8dae7eb3dd33b787aef1ca1e23ee9
parent 9408001b62b3805cc2f9e7b4868babfb35027be8

Pass all preferred locales to AssetManager

Test: manual
Bug: 117306409
Change-Id: I46fcf04e1137cfa4cc6d238f88ad6c683fa87376

native/android/configuration.cpp

diff --git a/native/android/configuration.cpp b/native/android/configuration.cpp
index b50514d..283445f 100644
--- a/native/android/configuration.cpp
+++ b/native/android/configuration.cpp
@@ -36,7 +36,7 @@
 
 void AConfiguration_fromAssetManager(AConfiguration* out, AAssetManager* am) {
     ScopedLock<AssetManager2> locked_mgr(*AssetManagerForNdkAssetManager(am));
-    ResTable_config config = locked_mgr->GetConfiguration();
+    ResTable_config config = locked_mgr->GetConfigurations()[0];
 
     // AConfiguration is not a virtual subclass, so we can memcpy.
     memcpy(out, &config, sizeof(config));