Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3160c8b0 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Revert "AssetManager2: Fix issue with native cast" 

This reverts commit 93811532.

Bug: 73134570
Change-Id: I5a63ed4b79d5c249ff77059783d9c9d56f0dcf93
parent 27d86e90

native/android/configuration.cpp

+2 −7
Original line number Diff line number Diff line
@@ -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) {