Merge "modem_svc: use shared_modem_platform to replace all modem_svc_sit" into main
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 0f17944..d8968e2 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -4,6 +4,9 @@
 dump_display sysfs file b/340722772
 dump_modem sscoredump_vendor_data_coredump_file dir b/366115873
 dump_modem sscoredump_vendor_data_logcat_file dir b/366115873
+hal_camera_default cgroup_desc_file file b/372347927
+hal_graphics_composer_default cgroup_desc_file file b/372348503
+hal_power_default cgroup_desc_file file b/372348558
 hal_power_default hal_power_default capability b/240632824
 hal_sensors_default sysfs file b/340723303
 hal_vibrator_default default_android_service service_manager b/317316478
@@ -13,6 +16,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 +39,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 9b23f49..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
 #
@@ -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