[MemInit] Use new MemInit API.

The system property will only disable heap memory initialization. If you
want to disable MTE (which I don't think was the subject of the original
patch), you can use the MTE sysprops: 'arm64.memtag.process.<pname> =
"off"'.

Bug: 135772972
Test: Device boots.
Change-Id: I180be76ff2f776f1ec1a607de848ff6c81da852d
This commit is contained in:
Mitch Phillips
2021-01-20 16:20:38 -08:00
parent d74597173a
commit 13df2fafda

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;