diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f6ae038..fd3c0a6 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -222,7 +222,6 @@ $(foreach sku, $(call to-upper, $(DEVICE_MANIFEST_SKUS)), \ )) DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ - $(COMMON_PATH)/vintf/xiaomi_framework_compatibility_matrix.xml \ hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \ hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml \ vendor/lineage/config/device_framework_matrix.xml diff --git a/proprietary-files.txt b/proprietary-files.txt index 915aba7..1f99c16 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1745,14 +1745,6 @@ vendor/lib/sensors.ultrasoundproximity.so vendor/lib64/libultrasound_notify.so vendor/lib64/sensors.ultrasoundproximity.so -# SLA -vendor/bin/hw/vendor.qti.sla.service@1.0-service -vendor/etc/init/vendor.qti.sla.service@1.0-service.rc -vendor/lib/vendor.qti.sla.service@1.0-impl.so -vendor/lib/vendor.qti.sla.service@1.0.so -vendor/lib64/vendor.qti.sla.service@1.0-impl.so -vendor/lib64/vendor.qti.sla.service@1.0.so - # Soter vendor/app/SoterService/SoterService.apk vendor/bin/SoterProvisioningTool diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 16eaab7..d39b409 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -28,10 +28,6 @@ type vendor_mac_vendor_data_file, data_file_type, file_type, mlstrustedobject; # Mlipay type ta_data_file, data_file_type, file_type; -# SLA -type sla_data_file, data_file_type, file_type; -type slad_socket, file_type; - # Thermal type sys_thermal_wifi_limit, fs_type, sysfs_type; type sys_thermal_flash_state, fs_type, sysfs_type; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index ebdc4bd..b1c7f9c 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -91,11 +91,6 @@ /(vendor|system/vendor)/bin/hw/vendor.xiaomi.sensor.communicate@1.0-service u:object_r:vendor_hal_sensorcommunicate_default_exec:s0 /dev/stmvl53l5 u:object_r:stmvl53l5_device:s0 -# SLA -/(vendor|system/vendor)/bin/hw/vendor\.qti\.sla\.service\@1\.0-service u:object_r:hal_slaservice_qti_exec:s0 -/data/vendor/sla(/.*)? u:object_r:sla_data_file:s0 -/dev/socket/slad u:object_r:slad_socket:s0 - # Thermal /(vendor|system/vendor)/bin/mi_thermald u:object_r:mi_thermald_exec:s0 /data/vendor/thermal(/.*)? u:object_r:thermal_data_file:s0 diff --git a/sepolicy/vendor/hal_slaservice.te b/sepolicy/vendor/hal_slaservice.te deleted file mode 100644 index 12a6780..0000000 --- a/sepolicy/vendor/hal_slaservice.te +++ /dev/null @@ -1,22 +0,0 @@ -type hal_slaservice_qti, domain; -type hal_slaservice_qti_exec, exec_type, file_type, vendor_file_type; -type hal_slaservice_hwservice, hwservice_manager_type; - -hal_attribute(slaservice) - -init_daemon_domain(hal_slaservice_qti) - -add_hwservice(hal_slaservice_server, hal_slaservice_hwservice) -hal_server_domain(hal_slaservice_qti, hal_slaservice) - -binder_call(hal_slaservice_client, hal_slaservice_server) - -allow hal_slaservice_qti socket_device:sock_file write; -allow hal_slaservice_client hal_slaservice_hwservice:hwservice_manager find; - -unix_socket_connect(hal_slaservice_qti, property, slad) -unix_socket_connect(hal_slaservice_qti, slad, init) -unix_socket_connect(hal_slaservice_qti, slad, slad) - -set_prop(hal_slaservice_qti, vendor_slad_prop) -set_prop(hal_slaservice_qti, vendor_slad_prop) diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts index 054f3e8..12da6b9 100644 --- a/sepolicy/vendor/hwservice_contexts +++ b/sepolicy/vendor/hwservice_contexts @@ -6,9 +6,6 @@ vendor.xiaomi.hardware.quickcamera::IQuickCameraService u:object_r:hal_quickcame # Fingerprint vendor.xiaomi.hardware.fx.tunnel::IMiFxTunnel u:object_r:vendor_hal_fingerprint_hwservice_xiaomi:s0 -# SLA -vendor.qti.sla.service::ISlaService u:object_r:hal_slaservice_hwservice:s0 - # Sensors vendor.xiaomi.sensor.citsensorservice::ICitSensorService u:object_r:vendor_hal_citsensorservice_xiaomi_hwservice:s0 vendor.xiaomi.sensor.communicate::ISensorCommunicate u:object_r:vendor_hal_sensorcommunicate_hwservice:s0 diff --git a/sepolicy/vendor/init.te b/sepolicy/vendor/init.te index 6b73d42..06ae4f8 100644 --- a/sepolicy/vendor/init.te +++ b/sepolicy/vendor/init.te @@ -1,6 +1,3 @@ -allow init slad_exec:file { getattr open read }; -allow init sla_data_file:file rw_file_perms; - set_prop(vendor_init, vendor_fp_prop) set_prop(vendor_init, vendor_fp_info_prop) set_prop(vendor_init, vendor_thermal_normal_prop) diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te index b5977b8..8d7a854 100644 --- a/sepolicy/vendor/property.te +++ b/sepolicy/vendor/property.te @@ -24,8 +24,5 @@ vendor_public_prop(vendor_nfc_mi_prop) # Panel vendor_public_prop(vendor_panel_info_prop) -# SLA -type vendor_slad_prop, property_type, vendor_property_type; - # Thermal vendor_public_prop(vendor_thermal_normal_prop) diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index 0aa7fd0..2c5ccb3 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -42,13 +42,5 @@ ro.vendor.se. u:object_r:vendor_nfc_mi_prop:s0 persist.vendor.sensors.ins. u:object_r:vendor_mi_ins_prop:s0 persist.vendor.sensors.ins_debug u:object_r:vendor_mi_ins_prop:s0 -# SLA -vendor.sla.enabled u:object_r:vendor_slad_prop:s0 -vendor.sla.ifaces u:object_r:vendor_slad_prop:s0 -vendor.sla.mode u:object_r:vendor_slad_prop:s0 -vendor.sla.uidwhitelist u:object_r:vendor_slad_prop:s0 -vendor.sla.wlan.interface u:object_r:vendor_slad_prop:s0 -vendor.sla.wwan.interface u:object_r:vendor_slad_prop:s0 - # Thermal vendor.sys.thermal.data.path u:object_r:vendor_thermal_normal_prop:s0 diff --git a/sepolicy/vendor/slad.te b/sepolicy/vendor/slad.te deleted file mode 100644 index 93a203a..0000000 --- a/sepolicy/vendor/slad.te +++ /dev/null @@ -1,41 +0,0 @@ -type slad, domain; -type slad_exec, exec_type, file_type, vendor_file_type; -type qti_proc_sla, proc_type; - -allow slad slad_socket:sock_file { getattr read write }; -allow slad slad_socket:sock_file unlink; -allow slad slad:netlink_socket { bind create read write }; -allow slad proc_net:file { getattr open read }; -allow slad system_file:lnk_file getattr; -allow slad self:capability { net_admin net_raw setgid setuid }; -allow slad self:netlink_tcpdiag_socket { create_socket_perms_no_ioctl nlmsg_read nlmsg_write }; -allow slad self:netlink_generic_socket { bind create read setopt write }; -allow slad self:rawip_socket { create getopt read setopt write }; -allow slad self:udp_socket { connect create getattr }; -allow slad sla_data_file:dir { add_name create read remove_name search unlink write }; -allow slad sla_data_file:dir create_dir_perms; -allow slad sla_data_file:file create_file_perms; -allow slad sla_data_file:file rw_file_perms; -allow slad socket_device:dir write; -allow slad socket_device:dir remove_name; -allow slad socket_device:dir add_name; -allow slad socket_device:sock_file { create setattr unlink }; -allow slad qti_proc_sla:dir search; -allow slad qti_proc_sla:file { map open read write }; -allow slad vendor_shell_exec:file execute_no_trans; - -dontaudit slad self:capability dac_read_search; - -init_daemon_domain(slad) - -unix_socket_connect(slad, dnsproxyd, slad) -unix_socket_connect(slad, dnsproxyd, netd) -unix_socket_connect(slad, dnsproxyd, init) -unix_socket_connect(slad, fwmarkd, slad) -unix_socket_connect(slad, fwmarkd, netd) -unix_socket_connect(slad, fwmarkd, init) -unix_socket_connect(slad, property, slad) -unix_socket_connect(slad, property, netd) - -set_prop(slad, vendor_slad_prop) -net_domain(slad) diff --git a/vintf/manifest_xiaomi.xml b/vintf/manifest_xiaomi.xml index 7fba305..ee1ccf8 100644 --- a/vintf/manifest_xiaomi.xml +++ b/vintf/manifest_xiaomi.xml @@ -12,15 +12,6 @@ default - - vendor.qti.sla.service - hwbinder - 1.0 - - ISlaService - default - - vendor.xiaomi.hardware.bgservice hwbinder diff --git a/vintf/xiaomi_framework_compatibility_matrix.xml b/vintf/xiaomi_framework_compatibility_matrix.xml deleted file mode 100644 index 677de17..0000000 --- a/vintf/xiaomi_framework_compatibility_matrix.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - vendor.qti.sla.service - 1.0 - - ISlaService - default - - -