Revert "AssetManager2: Fix issue with native cast"
This reverts commit 93811532096a2d0d822f64d6271dca4f1147841d.
Bug: 73134570
Change-Id: I5a63ed4b79d5c249ff77059783d9c9d56f0dcf93
diff --git a/native/android/configuration.cpp b/native/android/configuration.cpp
index 87fe9ed..77237ae 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_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) {