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

Merge "AssetManager2: Fix issue with native cast"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-09 10:36:33 +00:00
committed by Android (Google) Code Review
parent 49cdc08b4b 9381153209
commit c8b76fe1f4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
native/android/configuration.cpp
View File

@@ -17,9 +17,10 @@
#define LOG_TAG "Configuration"
#include <utils/Log.h>
#include <androidfw/AssetManager.h>
#include <androidfw/AssetManager2.h>
#include <android_runtime/android_content_res_Configuration.h>
#include <android_runtime/android_util_AssetManager.h>
using namespace android;
@@ -34,7 +35,11 @@ void AConfiguration_delete(AConfiguration* config) {
}
void AConfiguration_fromAssetManager(AConfiguration* out, AAssetManager* am) {
((AssetManager*)am)->getConfiguration(out);
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));
}
void AConfiguration_copy(AConfiguration* dest, AConfiguration* src) {