Snap for 9470583 from c3b8cda0f553ff0aee28635d232af83b6b99a441 to tm-qpr3-release

Change-Id: I1b3833cc68434508ba0c57749a93e65e4027dde6

7 files changed, 42 insertions, 9 deletions

diff --git a/fingerprint_capacitance/hal_fingerprint_capacitance.te b/fingerprint_capacitance/hal_fingerprint_capacitance.te
index 8cc623f..8c78ee5 100644
--- a/fingerprint_capacitance/hal_fingerprint_capacitance.te
+++ b/fingerprint_capacitance/hal_fingerprint_capacitance.te
@@ -19,6 +19,10 @@ hal_client_domain(hal_fingerprint_capacitance, hal_power);
 # allow fingerprint to find fwk service
 allow hal_fingerprint_capacitance fwk_stats_service:service_manager find;
 
+# allow fingerprint to access sysfs_leds
+allow hal_fingerprint_capacitance sysfs_leds:dir search;
+allow hal_fingerprint_capacitance sysfs_leds:file rw_file_perms;
+
 # allow fingerprint to access input_device
 allow hal_fingerprint_capacitance input_device:dir r_dir_perms;
 allow hal_fingerprint_capacitance input_device:chr_file rw_file_perms;
@@ -26,3 +30,6 @@ allow hal_fingerprint_capacitance input_device:chr_file rw_file_perms;
 # allow fingerprint to access hwservice
 hwbinder_use(hal_fingerprint_capacitance)
 add_hwservice(hal_fingerprint_capacitance, hal_fingerprint_capacitance_ext_hwservice)
+
+# allow fingerprint to access fwk sensor hwservice
+allow hal_fingerprint_capacitance fwk_sensor_hwservice:hwservice_manager find;
diff --git a/fingerprint_capacitance/servicemanager.te b/fingerprint_capacitance/servicemanager.te
new file mode 100644
index 0000000..6e1afe9
--- /dev/null
+++ b/fingerprint_capacitance/servicemanager.te
@@ -0,0 +1 @@
+binder_call(servicemanager, hal_fingerprint_capacitance)
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 5115738..440df93 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1,11 +1,3 @@
-convert-to-ext4-sh convert-to-ext4-sh capability b/241034024
-hal_dumpstate_default device chr_file b/240632721
 hal_dumpstate_default proc file b/240632721
 hal_dumpstate_default sysfs file b/240632721
-hal_fingerprint_capacitance default_android_hwservice hwservice_manager b/240633068
-hal_health_default sysfs file b/240632860
-hal_power_stats_default sysfs file b/240632970
 servicemanager hal_fingerprint_capacitance binder b/240632821
-system_suspend sysfs dir b/240632822
-system_suspend sysfs_batteryinfo dir b/240632822
-system_suspend sysfs_wlc dir b/240632822
diff --git a/vendor/device.te b/vendor/device.te
new file mode 100644
index 0000000..1a969b6
--- /dev/null
+++ b/vendor/device.te
@@ -0,0 +1 @@
+type vibrator_device, dev_type;
diff --git a/vendor/file_contexts b/vendor/file_contexts
index 0117b05..05e853f 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -11,3 +11,12 @@
 /dev/ttySAC18                       u:object_r:hci_attach_dev:s0
 /dev/logbuffer_btlpm                u:object_r:logbuffer_device:s0
 /dev/logbuffer_tty18                u:object_r:logbuffer_device:s0
+
+# Haptics
+/vendor/bin/hw/android\.hardware\.vibrator-service\.cs40l26-private         u:object_r:hal_vibrator_default_exec:s0
+/dev/gpiochip44                                                             u:object_r:vibrator_device:s0
+
+# Logbuffer
+/dev/logbuffer_dual_batt                                                    u:object_r:logbuffer_device:s0
+/dev/logbuffer_maxfg_secondary                                              u:object_r:logbuffer_device:s0
+/dev/logbuffer_maxfg_secondary_monitor                                      u:object_r:logbuffer_device:s0
diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts
index e69743c..38213ea 100644
--- a/vendor/genfs_contexts
+++ b/vendor/genfs_contexts
@@ -1,9 +1,10 @@
 # BMS
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222                 u:object_r:sysfs_wlc:s0
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222/power_supply    u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply            u:object_r:sysfs_batteryinfo:s0
 # maxfg_base
 genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-6/6-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
-# maxfg_flip
+# maxfg_secondary
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/7-0036/power_supply       u:object_r:sysfs_batteryinfo:s0
 
 
@@ -22,3 +23,22 @@ genfscon sysfs /devices/platform/1c2d0000.drmdsim/1c2d0000.drmdsim.0/backlight/p
 # Haptics
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-cs40l26a              u:object_r:sysfs_vibrator:s0
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-cs40l26a-dual         u:object_r:sysfs_vibrator:s0
+
+# Power System Suspend
+genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/s2mpg12-rtc/wakeup                            u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/s2mpg12-rtc/rtc/rtc0/alarmtimer.1.auto/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/s2mpg12-power-keys/wakeup                     u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/acpm_mfd_bus@18100000/i2c-8/i2c-s2mpg12mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/acpm_mfd_bus@18110000/i2c-9/i2c-s2mpg13mfd/wakeup                                        u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-6/6-0036/power_supply/maxfg_base/wakeup                               u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/7-0036/power_supply/maxfg_flip/wakeup                               u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/7-0036/power_supply/maxfg_secondary/wakeup                          u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222/power_supply/wireless/wakeup                              u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9222/wakeup                                                    u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/google,dual_batt_gauge/power_supply/dualbatt/wakeup                                      u:object_r:sysfs_wakeup:s0
+
+#Touch
+genfscon sysfs /devices/platform/10d10000.spi/spi_master/spi0/spi0.0    u:object_r:sysfs_touch:s0
+genfscon sysfs /devices/platform/10950000.spi/spi_master/spi6/spi6.0    u:object_r:sysfs_touch:s0
+genfscon proc  /fts/driver_test                                         u:object_r:proc_touch:s0
+genfscon proc  /fts_ext/driver_test                                     u:object_r:proc_touch:s0
diff --git a/vendor/hal_vibrator_default.te b/vendor/hal_vibrator_default.te
new file mode 100644
index 0000000..7858155
--- /dev/null
+++ b/vendor/hal_vibrator_default.te
@@ -0,0 +1,3 @@
+# For gpio dev node
+vndbinder_use(hal_vibrator_default);
+allow hal_vibrator_default vibrator_device:chr_file rw_file_perms;