diff options
Diffstat (limited to 'native/android/configuration.cpp')
-rw-r--r-- | native/android/configuration.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/native/android/configuration.cpp b/native/android/configuration.cpp index 87fe9edb49c5..77237ae97ff5 100644 --- a/native/android/configuration.cpp +++ b/native/android/configuration.cpp @@ -17,10 +17,9 @@ #define LOG_TAG "Configuration" #include <utils/Log.h> -#include <androidfw/AssetManager2.h> +#include <androidfw/AssetManager.h> #include <android_runtime/android_content_res_Configuration.h> -#include <android_runtime/android_util_AssetManager.h> using namespace android; @@ -35,11 +34,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(); - - // AConfiguration is not a virtual subclass, so we can memcpy. - memcpy(out, &config, sizeof(config)); + ((AssetManager*)am)->getConfiguration(out); } void AConfiguration_copy(AConfiguration* dest, AConfiguration* src) { |