From 53f39f78897c0a14a4a94a91f3580640fb312951 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Thu, 22 Jul 2021 16:32:58 +0200 Subject: [PATCH] sm7250-common: Kill touchfeature Change-Id: Iea8dbe1a69906627ffdabca70ecea624435fc53e --- fod/Android.bp | 1 - framework_compatibility_matrix.xml | 8 -------- lito.mk | 3 +-- manifest.xml | 5 ----- proprietary-files.txt | 5 ----- sepolicy/private/devicesettings_app.te | 2 -- sepolicy/public/attributes | 2 -- sepolicy/vendor/device.te | 2 -- sepolicy/vendor/file_contexts | 4 ---- sepolicy/vendor/hal_lineage_fod_lito.te | 4 ---- sepolicy/vendor/hal_touchfeature_default.te | 16 ---------------- sepolicy/vendor/hwservice.te | 2 -- sepolicy/vendor/hwservice_contexts | 1 - sepolicy/vendor/property.te | 3 --- sepolicy/vendor/property_contexts | 3 --- 15 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 sepolicy/vendor/hal_touchfeature_default.te diff --git a/fod/Android.bp b/fod/Android.bp index 18ed5b9..9ea1934 100644 --- a/fod/Android.bp +++ b/fod/Android.bp @@ -47,7 +47,6 @@ cc_binary { "vendor.lineage.biometrics.fingerprint.inscreen@1.0", "//hardware/xiaomi:vendor.goodix.hardware.biometrics.fingerprint@2.1", "//hardware/xiaomi:vendor.xiaomi.hardware.fingerprintextension@1.0", - "//hardware/xiaomi:vendor.xiaomi.hardware.touchfeature@1.0", ], vendor: true, } diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml index c880bd5..4c2b75c 100644 --- a/framework_compatibility_matrix.xml +++ b/framework_compatibility_matrix.xml @@ -459,12 +459,4 @@ default - - vendor.xiaomi.hardware.touchfeature - 1.0 - - ITouchFeature - default - - diff --git a/lito.mk b/lito.mk index 5bbc7ec..088c30f 100644 --- a/lito.mk +++ b/lito.mk @@ -209,8 +209,7 @@ PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.1-service.xiaomi_lito PRODUCT_PACKAGES += \ - vendor.xiaomi.hardware.fingerprintextension@1.0.vendor \ - vendor.xiaomi.hardware.touchfeature@1.0.vendor + vendor.xiaomi.hardware.fingerprintextension@1.0.vendor # Health PRODUCT_PACKAGES += \ diff --git a/manifest.xml b/manifest.xml index 58b463e..1d6b0f1 100644 --- a/manifest.xml +++ b/manifest.xml @@ -312,9 +312,4 @@ hwbinder @1.0::IMotor/default - - vendor.xiaomi.hardware.touchfeature - hwbinder - @1.0::ITouchFeature/default - diff --git a/proprietary-files.txt b/proprietary-files.txt index 6ff6c3b..5cf9c27 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -667,11 +667,6 @@ vendor/bin/time_daemon vendor/etc/init/init.time_daemon.rc vendor/lib64/libtime_genoff.so -# Touchfeature -vendor/bin/hw/vendor.xiaomi.hardware.touchfeature@1.0-service -vendor/etc/init/vendor.xiaomi.hardware.touchfeature@1.0-service.rc -vendor/lib64/hw/vendor.xiaomi.hardware.touchfeature@1.0-impl.so - # Trusted Execution Environment connector vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc diff --git a/sepolicy/private/devicesettings_app.te b/sepolicy/private/devicesettings_app.te index fb186ca..820006d 100644 --- a/sepolicy/private/devicesettings_app.te +++ b/sepolicy/private/devicesettings_app.te @@ -12,7 +12,6 @@ allow devicesettings_app { }:service_manager find; hal_client_domain(devicesettings_app, hal_motor) -hal_client_domain(devicesettings_app, hal_touchfeature) # Allow devicesettings_app read and write /data/data subdirectory allow devicesettings_app system_app_data_file:dir create_dir_perms; @@ -21,7 +20,6 @@ allow devicesettings_app system_app_data_file:{ file lnk_file } create_file_perm # Allow binder communication with gpuservice binder_call(devicesettings_app, gpuservice) binder_call(devicesettings_app, hal_motor) -binder_call(devicesettings_app, hal_touchfeature) # Allow devicesettings_app to read and write to cgroup/sysfs_leds/sysfs_thermal allow devicesettings_app sysfs_leds:dir search; diff --git a/sepolicy/public/attributes b/sepolicy/public/attributes index 2ee475e..2e6e922 100644 --- a/sepolicy/public/attributes +++ b/sepolicy/public/attributes @@ -1,5 +1,3 @@ hal_attribute_lineage(mlipay) hal_attribute_lineage(motor) - -hal_attribute_lineage(touchfeature) diff --git a/sepolicy/vendor/device.te b/sepolicy/vendor/device.te index bc29cde..5dee0d4 100644 --- a/sepolicy/vendor/device.te +++ b/sepolicy/vendor/device.te @@ -9,5 +9,3 @@ type lirc_device, dev_type; type motor_device, dev_type; type sound_device, dev_type; - -type touchfeature_device, dev_type; diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index e854cfb..1e899ff 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -84,10 +84,6 @@ /vendor/bin/mi_thermald u:object_r:mi_thermald_exec:s0 /data/vendor/thermal(/.*)? u:object_r:thermal_data_file:s0 -# Touchfeature -/dev/xiaomi-touch u:object_r:touchfeature_device:s0 -/vendor/bin/hw/vendor\.xiaomi\.hardware\.touchfeature@1\.0-service u:object_r:hal_touchfeature_default_exec:s0 - # USB /vendor/bin/init\.mi\.usb\.sh u:object_r:vendor_qti_init_shell_exec:s0 diff --git a/sepolicy/vendor/hal_lineage_fod_lito.te b/sepolicy/vendor/hal_lineage_fod_lito.te index 4e255d3..b206015 100644 --- a/sepolicy/vendor/hal_lineage_fod_lito.te +++ b/sepolicy/vendor/hal_lineage_fod_lito.te @@ -8,14 +8,10 @@ wakelock_use(hal_lineage_fod_lito) # Allow access to the HALs hal_client_domain(hal_lineage_fod_lito, hal_fingerprint) -hal_client_domain(hal_lineage_fod_lito, hal_touchfeature) # Allow binder communication with hal_fingerprint_lito binder_call(hal_lineage_fod_lito, hal_fingerprint_default) -# Allow binder communication with hal_touchfeature_default -binder_call(hal_lineage_fod_lito, hal_touchfeature_default) - allow hal_lineage_fod_lito sysfs_graphics:dir r_dir_perms; allow hal_lineage_fod_lito sysfs_graphics:file rw_file_perms; diff --git a/sepolicy/vendor/hal_touchfeature_default.te b/sepolicy/vendor/hal_touchfeature_default.te deleted file mode 100644 index eb57d87..0000000 --- a/sepolicy/vendor/hal_touchfeature_default.te +++ /dev/null @@ -1,16 +0,0 @@ -type hal_touchfeature_default, domain; -hal_server_domain(hal_touchfeature_default, hal_touchfeature) - -type hal_touchfeature_default_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(hal_touchfeature_default) - -binder_call(hal_touchfeature_client, hal_touchfeature_server) - -hal_attribute_hwservice(hal_touchfeature, hal_touchfeature_hwservice) - -# Allow hal_touchfeature_default to read and write to touchfeature_device -allow hal_touchfeature_default touchfeature_device:chr_file rw_file_perms; - -set_prop(hal_touchfeature_default, vendor_touchfeature_prop) - -vndbinder_use(hal_touchfeature_default) diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te index 013869c..cda7549 100644 --- a/sepolicy/vendor/hwservice.te +++ b/sepolicy/vendor/hwservice.te @@ -1,5 +1,3 @@ type hal_mlipay_hwservice, hwservice_manager_type; type hal_motor_hwservice, hwservice_manager_type; - -type hal_touchfeature_hwservice, hwservice_manager_type; diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts index 4bb8930..69640ba 100644 --- a/sepolicy/vendor/hwservice_contexts +++ b/sepolicy/vendor/hwservice_contexts @@ -7,4 +7,3 @@ vendor.xiaomi.hardware.campostproc::IMiPostProcService u: vendor.xiaomi.hardware.fingerprintextension::IXiaomiFingerprint u:object_r:hal_fingerprint_hwservice:s0 vendor.xiaomi.hardware.mlipay::IMlipayService u:object_r:hal_mlipay_hwservice:s0 vendor.xiaomi.hardware.motor::IMotor u:object_r:hal_motor_hwservice:s0 -vendor.xiaomi.hardware.touchfeature::ITouchFeature u:object_r:hal_touchfeature_hwservice:s0 diff --git a/sepolicy/vendor/property.te b/sepolicy/vendor/property.te index 73aaac0..76b935c 100644 --- a/sepolicy/vendor/property.te +++ b/sepolicy/vendor/property.te @@ -9,6 +9,3 @@ type power_prop, property_type; # Thermal type thermal_normal_prop, property_type; - -# Touchfeature -type vendor_touchfeature_prop, property_type; diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index abd1dfb..157ead9 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -66,8 +66,5 @@ sys.thermal. u:object_r:thermal_normal_prop:s0 vendor.sys.thermal. u:object_r:thermal_normal_prop:s0 persist.sys.thermal.config u:object_r:thermal_normal_prop:s0 -# Touchfeature -ro.vendor.touchfeature.type u:object_r:vendor_touchfeature_prop:s0 - # USB sys.usb.configfs u:object_r:system_prop:s0