From cc6ff3876e395040748627353b7384e49d90e4f9 Mon Sep 17 00:00:00 2001 From: Jeremy Meyer Date: Mon, 10 Jul 2023 17:06:52 +0000 Subject: 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 --- native/android/configuration.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'native/android/configuration.cpp') 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 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)); -- cgit v1.2.3-59-g8ed1b