diff options
| author | 2023-08-15 21:42:03 +0000 | |
|---|---|---|
| committer | 2023-08-17 18:24:48 +0000 | |
| commit | ccf5cd710da9e50932390deba68e1263990bea02 (patch) | |
| tree | a9d2cf4d82cf3b52e9926117f16c2857cb3ff023 /native/android/configuration.cpp | |
| parent | 413089960aa898eeb17a68bf1d4b8c9ca4df5c65 (diff) | |
Reland try 2 "Pass all preferred locales to AssetManager"
This reverts commit c57041138696b7a152a80513c67793fac1cad7c4.
Reason for revert: roll forward with fix
Test: manual
Change-Id: Ic4d1aa892efd9058d21ac88709fc565fd5f61909
Diffstat (limited to 'native/android/configuration.cpp')
| -rw-r--r-- | native/android/configuration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/android/configuration.cpp b/native/android/configuration.cpp index b50514d27bac..283445fc8a9a 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->GetConfiguration(); + ResTable_config config = locked_mgr->GetConfigurations()[0]; // AConfiguration is not a virtual subclass, so we can memcpy. memcpy(out, &config, sizeof(config)); |