[automerger skipped] Merge ab/AP4A.241205.013 into aosp-main-future am: b55ad960ba -s ours

am skip reason: Merged-In I195f779cc6588c37ccdbe4bb8b29ee8f2edd861a with SHA-1 e746382d78 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/30626026

Change-Id: I9dbe8645ca39bd25a8f0765d45592748985b3759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index 0f17944..9b21d33 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1,5 +1,7 @@
 
 battery_mitigation sysfs file b/364446534
+bluetooth audio_config_prop file b/379226761
+bluetooth audio_config_prop file b/379245675
 chre vendor_data_file dir b/301948771
 dump_display sysfs file b/340722772
 dump_modem sscoredump_vendor_data_coredump_file dir b/366115873
@@ -9,10 +11,20 @@
 hal_vibrator_default default_android_service service_manager b/317316478
 incidentd debugfs_wakeup_sources file b/282626428
 incidentd incidentd anon_inode b/282626428
+init init capability b/379591559
 kernel dm_device blk_file b/315907959
 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
+priv_app audio_config_prop file b/379226710
+priv_app audio_config_prop file b/379246066
+radio audio_config_prop file b/379227275
+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
@@ -20,13 +32,19 @@
 system_server vendor_default_prop file b/366115457
 system_server vendor_default_prop file b/366116435
 system_server vendor_default_prop file b/366116587
+untrusted_app audio_config_prop file b/379226644
+untrusted_app audio_config_prop file b/379246340
 untrusted_app nativetest_data_file dir b/305600845
 untrusted_app shell_test_data_file dir b/305600845
 untrusted_app system_data_root_file dir b/305600845
 untrusted_app userdebug_or_eng_prop file b/305600845
+untrusted_app_29 audio_config_prop file b/379246143
 vendor_init debugfs_trace_marker file b/340723222
 vendor_init default_prop file b/315104713
 vendor_init default_prop file b/316817111
 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
+zygote zygote capability b/379591519
diff --git a/whitechapel/vendor/google/dump_power.te b/whitechapel/vendor/google/dump_power.te
index d745b20..cf7c14e 100644
--- a/whitechapel/vendor/google/dump_power.te
+++ b/whitechapel/vendor/google/dump_power.te
@@ -13,3 +13,12 @@
 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;
+
+userdebug_or_eng(`
+  r_dir_file(dump_power, vendor_battery_debugfs)
+  r_dir_file(dump_power, vendor_maxfg_debugfs)
+  r_dir_file(dump_power, vendor_charger_debugfs)
+  r_dir_file(dump_power, vendor_votable_debugfs)
+  allow dump_power debugfs:dir r_dir_perms;
+  allow dump_power vendor_usb_debugfs:dir { search };
+')
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index e6dc12e..975652e 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -167,7 +167,7 @@
 /vendor/lib(64)?/libGralloc4Wrapper\.so                                 u:object_r:same_process_hal_file:s0
 /vendor/lib(64)?/pixel-power-ext-V1-ndk\.so                             u:object_r:same_process_hal_file:s0
 
-/dev/stmvl53l1_ranging                                                  u:object_r:rls_device:s0
+/dev/ispolin_ranging                                                    u:object_r:rls_device:s0
 
 /dev/lwis-act0                                                          u:object_r:lwis_device:s0
 /dev/lwis-act1                                                          u:object_r:lwis_device:s0
@@ -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
diff --git a/whitechapel/vendor/google/hwservice_contexts b/whitechapel/vendor/google/hwservice_contexts
index baf720b..577a678 100644
--- a/whitechapel/vendor/google/hwservice_contexts
+++ b/whitechapel/vendor/google/hwservice_contexts
@@ -11,7 +11,6 @@
 vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal        u:object_r:hal_exynos_rild_hwservice:s0
 
 # VIDEO
-android.hardware.media.c2::IComponentStore                      u:object_r:hal_codec2_hwservice:s0
 android.hardware.media.c2::IConfigurable                        u:object_r:hal_codec2_hwservice:s0
 
 # GRIL HAL
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)
 
diff --git a/whitechapel/vendor/google/service_contexts b/whitechapel/vendor/google/service_contexts
index 2536252..074dedf 100644
--- a/whitechapel/vendor/google/service_contexts
+++ b/whitechapel/vendor/google/service_contexts
@@ -3,4 +3,3 @@
 android.hardware.drm.IDrmFactory/widevine                  u:object_r:hal_drm_service:s0
 vendor.google.wireless_charger.IWirelessCharger/default                      u:object_r:hal_wireless_charger_service:s0
 rlsservice                                                 u:object_r:rls_service:s0
-android.hardware.media.c2.IComponentStore/default1                    u:object_r:hal_codec2_service:s0