diff --git a/touch/syna/dump_syna.sh b/touch/syna/dump_syna.sh index d30ff36..d749eff 100644 --- a/touch/syna/dump_syna.sh +++ b/touch/syna/dump_syna.sh @@ -1,5 +1,5 @@ #!/vendor/bin/sh -path="/sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs" +path=`getprop ro.vendor.touch.dump.sys` echo "Enable Force Touch Active" echo 21 > $path/force_active diff --git a/touch/syna/sepolicy/dump_syna.te b/touch/syna/sepolicy/dump_syna.te index 38655e7..fb9705c 100644 --- a/touch/syna/sepolicy/dump_syna.te +++ b/touch/syna/sepolicy/dump_syna.te @@ -3,3 +3,6 @@ pixel_bugreport(dump_syna) allow dump_syna sysfs_touch:dir r_dir_perms; allow dump_syna sysfs_touch:file rw_file_perms; allow dump_syna vendor_toolbox_exec:file execute_no_trans; + +get_prop(dump_syna, vendor_touch_dump_path_prop) + diff --git a/touch/syna/sepolicy/genfs_contexts b/touch/syna/sepolicy/genfs_contexts index de55bf3..2a8f9e3 100644 --- a/touch/syna/sepolicy/genfs_contexts +++ b/touch/syna/sepolicy/genfs_contexts @@ -1,2 +1,3 @@ genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs u:object_r:sysfs_touch:s0 +genfscon sysfs /devices/platform/111d0000.spi/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs u:object_r:sysfs_touch:s0 diff --git a/touch/syna/sepolicy/property.te b/touch/syna/sepolicy/property.te new file mode 100644 index 0000000..5484690 --- /dev/null +++ b/touch/syna/sepolicy/property.te @@ -0,0 +1 @@ +vendor_internal_prop(vendor_touch_dump_path_prop) diff --git a/touch/syna/sepolicy/property_contexts b/touch/syna/sepolicy/property_contexts new file mode 100644 index 0000000..524cc8b --- /dev/null +++ b/touch/syna/sepolicy/property_contexts @@ -0,0 +1 @@ +ro.vendor.touch.dump. u:object_r:vendor_touch_dump_path_prop:s0 diff --git a/touch/syna/sepolicy/vendor_init.te b/touch/syna/sepolicy/vendor_init.te new file mode 100644 index 0000000..74a6666 --- /dev/null +++ b/touch/syna/sepolicy/vendor_init.te @@ -0,0 +1 @@ +set_prop(vendor_init, vendor_touch_dump_path_prop) diff --git a/touch/syna/syna.mk b/touch/syna/syna.mk deleted file mode 100644 index 7f137a0..0000000 --- a/touch/syna/syna.mk +++ /dev/null @@ -1,3 +0,0 @@ -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy - -PRODUCT_PACKAGES += dump_syna.sh diff --git a/touch/syna/syna0.mk b/touch/syna/syna0.mk new file mode 100644 index 0000000..fe2b0c5 --- /dev/null +++ b/touch/syna/syna0.mk @@ -0,0 +1,5 @@ +PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/devices/platform/10d10000.spi/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs + +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy + +PRODUCT_PACKAGES += dump_syna.sh diff --git a/touch/syna/syna20.mk b/touch/syna/syna20.mk new file mode 100644 index 0000000..600f1ff --- /dev/null +++ b/touch/syna/syna20.mk @@ -0,0 +1,5 @@ +PRODUCT_VENDOR_PROPERTIES += ro.vendor.touch.dump.sys=/sys/devices/platform/111d0000.spi/spi_master/spi20/spi20.0/synaptics_tcm.0/sysfs + +BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/syna/sepolicy + +PRODUCT_PACKAGES += dump_syna.sh