Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "AssetManager2: Fix issue with native cast"

Browse Source 
This reverts commit 9381153209.

Bug: 73134570
Change-Id: I5a63ed4b79d5c249ff77059783d9c9d56f0dcf93
This commit is contained in:
Adam Lesinski
2018-02-09 11:01:13 -08:00
parent 27d86e9088
commit 3160c8b0f7
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
native/android/configuration.cpp
View File

@@ -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) {