Merge "Allow vendor_init to set the touch properties"
diff --git a/battery_mitigation/sepolicy/genfs_contexts b/battery_mitigation/sepolicy/genfs_contexts
index 66d63dd..84c6e21 100644
--- a/battery_mitigation/sepolicy/genfs_contexts
+++ b/battery_mitigation/sepolicy/genfs_contexts
@@ -1 +1,3 @@
genfscon sysfs /devices/virtual/pmic/mitigation u:object_r:sysfs_bcl:s0
+genfscon sysfs /bus/iio/devices/iio:device0/lpf_power u:object_r:sysfs_bcl:s0
+genfscon sysfs /bus/iio/devices/iio:device1/lpf_power u:object_r:sysfs_bcl:s0
diff --git a/wireless_charger/sepolicy/file.te b/wireless_charger/sepolicy/file.te
deleted file mode 100644
index 71c118c..0000000
--- a/wireless_charger/sepolicy/file.te
+++ /dev/null
@@ -1 +0,0 @@
-type sysfs_wlc, sysfs_type, fs_type;
diff --git a/wireless_charger/sepolicy/hal_dumpstate_default.te b/wireless_charger/sepolicy/hal_dumpstate_default.te
new file mode 100644
index 0000000..748345c
--- /dev/null
+++ b/wireless_charger/sepolicy/hal_dumpstate_default.te
@@ -0,0 +1,3 @@
+allow hal_dumpstate_default sysfs_wlc:dir search;
+allow hal_dumpstate_default sysfs_wlc:dir r_dir_perms;
+allow hal_dumpstate_default sysfs_wlc:file r_file_perms;
diff --git a/wireless_charger/sepolicy/hal_googlebattery.te b/wireless_charger/sepolicy/hal_googlebattery.te
new file mode 100644
index 0000000..6fda60f
--- /dev/null
+++ b/wireless_charger/sepolicy/hal_googlebattery.te
@@ -0,0 +1,2 @@
+r_dir_file(hal_googlebattery, sysfs_wlc)
+allow hal_googlebattery sysfs_wlc:file rw_file_perms;
diff --git a/wireless_charger/sepolicy/hal_health_default.te b/wireless_charger/sepolicy/hal_health_default.te
new file mode 100644
index 0000000..51ef352
--- /dev/null
+++ b/wireless_charger/sepolicy/hal_health_default.te
@@ -0,0 +1 @@
+allow hal_health_default sysfs_wlc:dir search;
diff --git a/wireless_charger/sepolicy/hal_sensors_default.te b/wireless_charger/sepolicy/hal_sensors_default.te
new file mode 100644
index 0000000..ed0efd0
--- /dev/null
+++ b/wireless_charger/sepolicy/hal_sensors_default.te
@@ -0,0 +1 @@
+allow hal_sensors_default sysfs_wlc:dir r_dir_perms;
diff --git a/wireless_charger/sepolicy/hal_wireless_charger.te b/wireless_charger/sepolicy/hal_wireless_charger.te
index f4cdee5..7ab8d83 100644
--- a/wireless_charger/sepolicy/hal_wireless_charger.te
+++ b/wireless_charger/sepolicy/hal_wireless_charger.te
@@ -1,6 +1,3 @@
-type hal_wireless_charger, domain;
-type hal_wireless_charger_exec, exec_type, vendor_file_type, file_type;
-
init_daemon_domain(hal_wireless_charger)
r_dir_file(hal_wireless_charger, sysfs_batteryinfo)
diff --git a/wireless_charger/sepolicy/pixelstats_vendor.te b/wireless_charger/sepolicy/pixelstats_vendor.te
new file mode 100644
index 0000000..cc2bd92
--- /dev/null
+++ b/wireless_charger/sepolicy/pixelstats_vendor.te
@@ -0,0 +1,3 @@
+# Wireless charge
+allow pixelstats_vendor sysfs_wlc:dir search;
+allow pixelstats_vendor sysfs_wlc:file rw_file_perms;
diff --git a/wireless_charger/sepolicy/service.te b/wireless_charger/sepolicy/service.te
deleted file mode 100644
index 2795b0d..0000000
--- a/wireless_charger/sepolicy/service.te
+++ /dev/null
@@ -1 +0,0 @@
-type hal_wireless_charger_service, hal_service_type, protected_service, service_manager_type;
diff --git a/wireless_charger/sepolicy/shell.te b/wireless_charger/sepolicy/shell.te
new file mode 100644
index 0000000..cd4fb18
--- /dev/null
+++ b/wireless_charger/sepolicy/shell.te
@@ -0,0 +1,2 @@
+# wlc
+dontaudit shell sysfs_wlc:dir search;
diff --git a/wireless_charger/wireless_charger.mk b/wireless_charger/wireless_charger.mk
index 8ff9a7b..acf5fc1 100644
--- a/wireless_charger/wireless_charger.mk
+++ b/wireless_charger/wireless_charger.mk
@@ -1,4 +1,3 @@
-
PRODUCT_SOONG_NAMESPACES += vendor/google/interfaces
PRODUCT_PACKAGES += vendor.google.wireless_charger-default
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml