From 3160c8b0f792d2153f020fe810290ddf8d61b15c Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Fri, 9 Feb 2018 11:01:13 -0800
Subject: Revert "AssetManager2: Fix issue with native cast"

This reverts commit 93811532096a2d0d822f64d6271dca4f1147841d.

Bug: 73134570
Change-Id: I5a63ed4b79d5c249ff77059783d9c9d56f0dcf93
---
 native/android/configuration.cpp | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'native/android/configuration.cpp')

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) {
-- 
cgit v1.2.3-59-g8ed1b