diff options
| author | 2023-07-20 22:17:27 +0000 | |
|---|---|---|
| committer | 2023-07-20 22:17:27 +0000 | |
| commit | 04cf00dc276789b890b7eaa717dddd85832e8151 (patch) | |
| tree | 3a41d5219ee8dae7eb3dd33b787aef1ca1e23ee9 /native/android/configuration.cpp | |
| parent | cc6ff3876e395040748627353b7384e49d90e4f9 (diff) | |
Reland "Pass all preferred locales to AssetManager"
This reverts commit cc6ff3876e395040748627353b7384e49d90e4f9.
Reason for revert: Fixed the tests in a separate change
Test: ran the previously failing tests in ab
Change-Id: I588d563375388ab1030c9de2072efe865286425c
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)); |