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

Merge "camera 2.4: conditionally disable memory init" am: 6c6fd401a8 am: 8e69ad680f am: b9172fcc07

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1449141

Change-Id: I4b99b539b8f04f45269bcd1a5136f39b2987df17
This commit is contained in:
Steven Moreland 2020-10-12 17:53:47 +00:00 committed by Automerger Merge Worker
commit b088e60825
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
camera/provider/2.4/default/Android.bp
View file

@ -76,7 +76,7 @@ cc_library_shared {
header_libs: [
"camera.device@3.4-external-impl_headers",
"camera.device@3.5-external-impl_headers",
"camera.device@3.6-external-impl_headers"
"camera.device@3.6-external-impl_headers",
],
export_include_dirs: ["."],
}
@ -150,6 +150,7 @@ cc_defaults {
"android.hidl.memory@1.0",
"libbinder",
"libcamera_metadata",
"libcutils",
"libhardware",
"libhidlbase",
"liblog",

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

@ -22,6 +22,8 @@
#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>
using android::status_t;
@ -41,6 +43,12 @@ int main()
// The camera HAL may communicate to other vendor components via
// /dev/vndbinder
android::ProcessState::initWithDriver("/dev/vndbinder");
// b/166675194
if (property_get_bool("ro.vendor.camera.provider24.disable_mem_init", false)) {
process_disable_memory_mitigations();
}
status_t status;
if (kLazyService) {
status = defaultLazyPassthroughServiceImplementation<ICameraProvider>("legacy/0",