Merge "gps: Add rule for location"
diff --git a/vendor/google/file.te b/vendor/google/file.te
index cb8eb35..d527cb0 100644
--- a/vendor/google/file.te
+++ b/vendor/google/file.te
@@ -11,6 +11,7 @@
# Battery-related files
type debugfs_batteryinfo, debugfs_type, fs_type;
+type sysfs_chargelevel, sysfs_type, fs_type;
#sysfs files
type sysfs_display, sysfs_type, fs_type;
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index 1e20774..fd3d5ff 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -28,7 +28,6 @@
/vendor/bin/hw/android\.hardware\.authsecret@1\.0-service\.citadel u:object_r:hal_authsecret_citadel_exec:s0
/vendor/bin/hw/android\.hardware\.biometrics\.face@1\.0-service\.google u:object_r:hal_face_default_exec:s0
/vendor/bin/hw/android\.hardware\.camera\.provider@2\.4-service-google u:object_r:hal_camera_default_exec:s0
-/vendor/bin/hw/android\.hardware\.health@2\.0-service\.coral u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/android\.hardware\.keymaster@4\.0-service\.citadel u:object_r:hal_keymaster_citadel_exec:s0
/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-noronha u:object_r:hal_neuralnetworks_darwinn_exec:s0
/vendor/bin/hw/android\.hardware\.oemlock@1\.0-service\.citadel u:object_r:hal_oemlock_citadel_exec:s0
diff --git a/vendor/google/genfs_contexts b/vendor/google/genfs_contexts
index 73ed7bf..17b5434 100644
--- a/vendor/google/genfs_contexts
+++ b/vendor/google/genfs_contexts
@@ -107,6 +107,8 @@
genfscon debugfs /logbuffer/wireless u:object_r:debugfs_batteryinfo:s0
genfscon debugfs /google_charger u:object_r:debugfs_batteryinfo:s0
genfscon debugfs /google_battery u:object_r:debugfs_batteryinfo:s0
+genfscon sysfs /devices/platform/soc/soc:google,charger/charge_start_level u:object_r:sysfs_chargelevel:s0
+genfscon sysfs /devices/platform/soc/soc:google,charger/charge_stop_level u:object_r:sysfs_chargelevel:s0
# Pixelstats
genfscon sysfs /devices/virtual/misc/msm_cirrus_playback/resistance_left_right u:object_r:sysfs_pixelstats:s0
diff --git a/vendor/google/hal_health_default.te b/vendor/google/hal_health_default.te
index 19c8f08..838a403 100644
--- a/vendor/google/hal_health_default.te
+++ b/vendor/google/hal_health_default.te
@@ -15,5 +15,7 @@
allow hal_health_default sysfs_wlc:dir r_dir_perms;
allow hal_health_default sysfs_thermal:dir r_dir_perms;
allow hal_health_default sysfs_thermal:file rw_file_perms;
+allow hal_health_default sysfs_chargelevel:file rw_file_perms;
set_prop(hal_health_default, vendor_shutdown_prop)
+set_prop(hal_health_default, vendor_battery_defender_prop)
diff --git a/vendor/google/property.te b/vendor/google/property.te
index 3b1e129..a13b61f 100644
--- a/vendor/google/property.te
+++ b/vendor/google/property.te
@@ -30,6 +30,7 @@
# hal_health
type vendor_shutdown_prop, property_type;
+type vendor_battery_defender_prop, property_type;
# SecureElement property
type vendor_secure_element_prop, property_type;
diff --git a/vendor/google/property_contexts b/vendor/google/property_contexts
index 68557cf..e783fe8 100644
--- a/vendor/google/property_contexts
+++ b/vendor/google/property_contexts
@@ -29,6 +29,9 @@
vendor.display.native_display_primaries_ready u:object_r:vendor_display_prop:s0
vendor.display.enable_kernel_idle_timer u:object_r:vendor_display_prop:s0
+# battery
+vendor.battery.defender. u:object_r:vendor_battery_defender_prop:s0
+
# Tcpdump_logger
persist.vendor.tcpdump.log.alwayson u:object_r:vendor_tcpdump_log_prop:s0
vendor.tcpdump.log.ondemand u:object_r:vendor_tcpdump_log_prop:s0
