diff --git a/common.mk b/common.mk index 1499348..922765e 100644 --- a/common.mk +++ b/common.mk @@ -27,6 +27,9 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) $(call inherit-product, vendor/oneplus/sm7250-common/sm7250-common-vendor.mk) $(call inherit-product, $(LOCAL_PATH)/interfaces.mk) +# Inherit Oneplus Camera +$(call inherit-product, vendor/oneplus/avicii-camera/config.mk) + # Additional native libraries PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt diff --git a/proprietary-files.txt b/proprietary-files.txt index 79a3bb7..cc161b7 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -148,6 +148,64 @@ vendor/lib64/libcvp_common.so vendor/lib64/libcvpcpuRev_skel.so vendor/lib64/vendor.qti.hardware.cvp@1.0.so +# CNE +product/etc/permissions/vendor.qti.hardware.data.connection-V1.0-java.xml +product/etc/permissions/vendor.qti.hardware.data.connection-V1.1-java.xml +-system_ext/framework/com.quicinc.cne.api-V1.0-java.jar +-system_ext/framework/com.quicinc.cne.api-V1.1-java.jar +-system_ext/framework/com.quicinc.cne.constants-V1.0-java.jar +-system_ext/framework/com.quicinc.cne.constants-V2.0-java.jar +-system_ext/framework/com.quicinc.cne.constants-V2.1-java.jar +-system_ext/framework/vendor.qti.data.factory-V1.0-java.jar +-system_ext/framework/vendor.qti.data.factory-V2.0-java.jar +-system_ext/framework/vendor.qti.data.factory-V2.1-java.jar +-system_ext/framework/vendor.qti.data.mwqem-V1.0-java.jar +-system_ext/framework/vendor.qti.data.slm-V1.0-java.jar +-system_ext/framework/vendor.qti.hardware.data.cne.internal.api-V1.0-java.jar +-system_ext/framework/vendor.qti.hardware.data.cne.internal.constants-V1.0-java.jar +-system_ext/framework/vendor.qti.hardware.data.cne.internal.server-V1.0-java.jar +-system_ext/framework/vendor.qti.hardware.data.connection-V1.0-java.jar +-system_ext/framework/vendor.qti.hardware.data.connection-V1.1-java.jar +-system_ext/framework/vendor.qti.hardware.data.dynamicdds-V1.0-java.jar +-system_ext/framework/vendor.qti.hardware.data.iwlan-V1.0-java.jar +-system_ext/framework/vendor.qti.hardware.data.qmi-V1.0-java.jar +system_ext/lib/com.quicinc.cne.api@1.0.so +system_ext/lib/com.quicinc.cne.api@1.1.so +system_ext/lib/com.quicinc.cne.constants@1.0.so +system_ext/lib/com.quicinc.cne.constants@2.0.so +system_ext/lib/com.quicinc.cne.constants@2.1.so +system_ext/lib/vendor.qti.data.factory@1.0.so +system_ext/lib/vendor.qti.data.factory@2.0.so +system_ext/lib/vendor.qti.data.factory@2.1.so +system_ext/lib/vendor.qti.data.mwqem@1.0.so +system_ext/lib/vendor.qti.data.slm@1.0.so +system_ext/lib/vendor.qti.hardware.data.cne.internal.api@1.0.so +system_ext/lib/vendor.qti.hardware.data.cne.internal.constants@1.0.so +system_ext/lib/vendor.qti.hardware.data.cne.internal.server@1.0.so +system_ext/lib/vendor.qti.hardware.data.connection@1.0.so +system_ext/lib/vendor.qti.hardware.data.connection@1.1.so +system_ext/lib/vendor.qti.hardware.data.dynamicdds@1.0.so +system_ext/lib/vendor.qti.hardware.data.iwlan@1.0.so +system_ext/lib/vendor.qti.hardware.data.qmi@1.0.so +system_ext/lib64/com.quicinc.cne.api@1.0.so +system_ext/lib64/com.quicinc.cne.api@1.1.so +system_ext/lib64/com.quicinc.cne.constants@1.0.so +system_ext/lib64/com.quicinc.cne.constants@2.0.so +system_ext/lib64/com.quicinc.cne.constants@2.1.so +system_ext/lib64/vendor.qti.data.factory@1.0.so +system_ext/lib64/vendor.qti.data.factory@2.0.so +system_ext/lib64/vendor.qti.data.factory@2.1.so +system_ext/lib64/vendor.qti.data.mwqem@1.0.so +system_ext/lib64/vendor.qti.data.slm@1.0.so +system_ext/lib64/vendor.qti.hardware.data.cne.internal.api@1.0.so +system_ext/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so +system_ext/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so +system_ext/lib64/vendor.qti.hardware.data.connection@1.0.so +system_ext/lib64/vendor.qti.hardware.data.connection@1.1.so +system_ext/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so +system_ext/lib64/vendor.qti.hardware.data.iwlan@1.0.so +system_ext/lib64/vendor.qti.hardware.data.qmi@1.0.so + # Display vendor/bin/hw/vendor.oneplus.hardware.display@1.0-service vendor/etc/init/vendor.oneplus.hardware.display@1.0-service.rc diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te index 7e36e28..a9cf1b6 100644 --- a/sepolicy/vendor/hal_camera_default.te +++ b/sepolicy/vendor/hal_camera_default.te @@ -1,4 +1,5 @@ hal_client_domain(hal_camera_default, hal_cameraHIDL) +binder_call(hal_camera_default, vendor_hal_qspmhal_default) allow hal_camera_default mnt_vendor_file:dir w_dir_perms; allow hal_camera_default mnt_vendor_file:file create_file_perms; @@ -18,8 +19,14 @@ allow hal_camera_default vl53l1_device:chr_file rw_file_perms; allow hal_camera_default proc_meminfo:file r_file_perms; allow hal_camera_default vendor_sysfs_video_call_on:file rw_file_perms; +allow hal_camera_default vendor_hal_qspmhal_hwservice:hwservice_manager find; get_prop(hal_camera_default, ctl_default_prop) get_prop(hal_camera_default, vendor_camera_prop) get_prop(hal_camera_default, vendor_db_security_prop) get_prop(hal_camera_default, vendor_mmi_prop) + +allow hal_camera_default cgroup:file getattr; +get_prop(hal_camera_default, default_prop) + +allow hal_camera_default vendor_xdsp_device:chr_file { ioctl open read }; diff --git a/sepolicy/vendor/untrusted_app.te b/sepolicy/vendor/untrusted_app.te new file mode 100644 index 0000000..5e8fe46 --- /dev/null +++ b/sepolicy/vendor/untrusted_app.te @@ -0,0 +1,12 @@ +allow untrusted_app zygote:unix_stream_socket getopt; +allow untrusted_app vendor_xdsp_device:chr_file ioctl; +allow untrusted_app app_data_file:file execute; +allow untrusted_app proc_stat:file open; +allow untrusted_app vendor_hal_camera_postproc_hwservice:hwservice_manager find; +allow untrusted_app app_data_file:file execute; +allow untrusted_app proc_pid_max:file read; + +allow untrusted_app proc_max_map_count:file { getattr open read }; +allow untrusted_app proc_version:file { getattr open read }; +allow untrusted_app proc_zoneinfo:file { getattr open read }; +allow untrusted_app vendor_file:file { execute getattr map open read }; diff --git a/sepolicy/vendor/untrusted_app_29.te b/sepolicy/vendor/untrusted_app_29.te index 4f689a2..0c8115c 100644 --- a/sepolicy/vendor/untrusted_app_29.te +++ b/sepolicy/vendor/untrusted_app_29.te @@ -1 +1,9 @@ -get_prop(untrusted_app_29, vendor_persist_camera_prop) +allow untrusted_app_29 app_data_file:file execute; +allow untrusted_app_29 proc_zoneinfo:file { getattr open read }; +allow untrusted_app_29 adsprpcd_file:dir { getattr read }; +allow untrusted_app_29 adsprpcd_file:file { getattr }; +allow untrusted_app_29 vendor_file:file { execute getattr map open read }; +allow untrusted_app_29 vendor_sysfs_kgsl:file { getattr open read }; +allow untrusted_app_29 hal_camera_default:binder { call }; +allow untrusted_app_29 vendor_xdsp_device:chr_file { ioctl }; +allow untrusted_app_29 zygote:unix_stream_socket { getopt }; diff --git a/system.prop b/system.prop index 23d7269..e9ca935 100644 --- a/system.prop +++ b/system.prop @@ -23,6 +23,7 @@ ro.bluetooth.library_name=libbluetooth_qti.so # Camera camera.disable_zsl_mode=true +persist.camera.privapp.list=com.oneplus.camera # Charger ro.charger.disable_init_blank=true