Merge "Remove duplicate service entries" into main
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 0f17944..e01f4cf 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -13,6 +13,12 @@
kernel kernel capability b/340722537
kernel kernel capability b/340723030
kernel tmpfs chr_file b/315907959
+modem_svc_sit hal_radioext_default process b/372348067
+pixelstats_vendor block_device dir b/369537606
+pixelstats_vendor block_device dir b/369735407
+platform_app vendor_fw_file dir b/372122654
+platform_app vendor_rild_prop file b/372122654
+ramdump ramdump capability b/369538457
rfsd vendor_cbd_prop file b/317734418
shell sysfs_net file b/329380904
ssr_detector_app default_prop file b/350831964
@@ -30,3 +36,5 @@
vendor_init default_prop property_service b/315104713
vendor_init default_prop property_service b/366115458
vendor_init default_prop property_service b/366116214
+vendor_init default_prop property_service b/369735133
+vendor_init default_prop property_service b/369735170
diff --git a/whitechapel/vendor/google/dump_power.te b/whitechapel/vendor/google/dump_power.te
new file mode 100644
index 0000000..d745b20
--- /dev/null
+++ b/whitechapel/vendor/google/dump_power.te
@@ -0,0 +1,15 @@
+# Allow dumpstate to execute dump_power
+pixel_bugreport(dump_power);
+
+allow dump_power sysfs_acpm_stats:dir r_dir_perms;
+allow dump_power sysfs_acpm_stats:file r_file_perms;
+allow dump_power sysfs_cpu:file r_file_perms;
+allow dump_power sysfs_wlc:file r_file_perms;
+allow dump_power sysfs_wlc:dir search;
+allow dump_power sysfs_batteryinfo:dir r_dir_perms;
+allow dump_power sysfs_batteryinfo:file r_file_perms;
+allow dump_power logbuffer_device:chr_file r_file_perms;
+allow dump_power mitigation_vendor_data_file:dir r_dir_perms;
+allow dump_power mitigation_vendor_data_file:file r_file_perms;
+allow dump_power sysfs_bcl:dir r_dir_perms;
+allow dump_power sysfs_bcl:file r_file_perms;
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index 97ff74c..fc845ff 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -16,7 +16,7 @@
/(vendor|system/vendor)/lib(64)?/libgpudataproducer\.so u:object_r:same_process_hal_file:s0
/vendor/bin/dumpsys u:object_r:vendor_dumpsys:s0
-
+/vendor/bin/dump/dump_power u:object_r:dump_power_exec:s0
#
# HALs
#
@@ -244,8 +244,8 @@
# TCP logging
/vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0
-# modem_svc_sit files
-/vendor/bin/modem_svc_sit u:object_r:modem_svc_sit_exec:s0
+# shared_modem_platform files
+/vendor/bin/shared_modem_platform u:object_r:modem_svc_sit_exec:s0
/data/vendor/modem_stat(/.*)? u:object_r:modem_stat_data_file:s0
# modem mnt files
@@ -372,5 +372,6 @@
# Statsd service to support EdgeTPU metrics logging service.
/vendor/lib64/android\.frameworks\.stats-V1-ndk\.so u:object_r:same_process_hal_file:s0
+/vendor/lib64/android\.frameworks\.stats-V2-ndk\.so u:object_r:same_process_hal_file:s0
/vendor/lib64/vendor-pixelatoms-cpp\.so u:object_r:same_process_hal_file:s0
/vendor/lib64/libprotobuf-cpp-lite-(\d+\.){2,3}so u:object_r:same_process_hal_file:s0
diff --git a/whitechapel/vendor/google/modem_svc_sit.te b/whitechapel/vendor/google/modem_svc_sit.te
index 8e4ac3d..e0379a8 100644
--- a/whitechapel/vendor/google/modem_svc_sit.te
+++ b/whitechapel/vendor/google/modem_svc_sit.te
@@ -1,3 +1,4 @@
+# Selinux rule for modem_svc_sit daemon
type modem_svc_sit, domain;
type modem_svc_sit_exec, vendor_file_type, exec_type, file_type;
init_daemon_domain(modem_svc_sit)
@@ -31,6 +32,9 @@
# logging property
get_prop(modem_svc_sit, vendor_logger_prop)
+# Modem SVC will register the default instance of the AIDL ISharedModemPlatform hal.
+hal_server_domain(modem_svc_sit, hal_shared_modem_platform)
+
# Modem property
set_prop(modem_svc_sit, vendor_modem_prop)