tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "[MemInit] Use new MemInit API."

Browse source
This commit is contained in:
Mitch Phillips 2021-02-01 23:32:24 +00:00 committed by Gerrit Code Review
commit 5daa3ab5e0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
camera/provider/2.4/default/service.cpp
View file

@ -22,9 +22,9 @@
#include <android/hardware/camera/provider/2.4/ICameraProvider.h>
#include <binder/ProcessState.h>
#include <cutils/memory.h>
#include <cutils/properties.h>
#include <hidl/LegacySupport.h>
#include <malloc.h>
using android::status_t;
using android::hardware::defaultLazyPassthroughServiceImplementation;
@ -46,7 +46,13 @@ int main()
// b/166675194
if (property_get_bool("ro.vendor.camera.provider24.disable_mem_init", false)) {
process_disable_memory_mitigations();
if (mallopt(M_BIONIC_ZERO_INIT, 0) == 0) {
// Note - heap initialization is only present on devices with Scudo.
// Devices with jemalloc don't have heap-init, and thus the mallopt
// will fail. On these devices, you probably just want to remove the
// property.
ALOGE("Disabling heap initialization failed.");
}
}
status_t status;