diff options
| author | 2023-08-09 16:42:46 +0000 | |
|---|---|---|
| committer | 2023-08-09 21:43:33 +0000 | |
| commit | c57041138696b7a152a80513c67793fac1cad7c4 (patch) | |
| tree | 75c6a80063d354c15715c200b0bc11d45a99725a /native/android/configuration.cpp | |
| parent | 04cf00dc276789b890b7eaa717dddd85832e8151 (diff) | |
Revert "Reland "Pass all preferred locales to AssetManager""
This reverts commit 04cf00dc276789b890b7eaa717dddd85832e8151.
Reason for revert: causes b/292445325 and b/292321908
Fixes: 292445325
Fixes: 292321908
Change-Id: Idb44723ad7e8b14b737305d194f79dd70630621d
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 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)); |