Update avc error on ROM 7502913 am: 6725015431 am: 0fc9b3a0fb
Original change: https://android-review.googlesource.com/c/device/google/crosshatch-sepolicy/+/1749682
Change-Id: Ib9420c70cbce43c4c247e35ebc9daf548be3c528
diff --git a/crosshatch-sepolicy.mk b/crosshatch-sepolicy.mk
index 2538aca..7acee6e 100644
--- a/crosshatch-sepolicy.mk
+++ b/crosshatch-sepolicy.mk
@@ -7,9 +7,9 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/crosshatch-sepolicy/vendor/google
BOARD_VENDOR_SEPOLICY_DIRS += device/google/crosshatch-sepolicy/vendor/verizon
BOARD_VENDOR_SEPOLICY_DIRS += device/google/crosshatch-sepolicy/tracking_denials
+BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/ramdump/common
# Pixel-wide policies
-BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/citadel
BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/powerstats
# vendors for backward compatibility
diff --git a/vendor/google/bug_map b/vendor/google/bug_map
index 572b334..810d53a 100644
--- a/vendor/google/bug_map
+++ b/vendor/google/bug_map
@@ -2,12 +2,14 @@
cdsprpcd system_file dir b/109882276
dataservice_app vendor_default_prop file b/79617173
factory_ota_app vendor_default_prop file b/79617173
+google_camera_app selinuxfs file b/175910397
hal_bluetooth_default hal_bluetooth_default socket b/126576829
hal_bluetooth_default ramdump_vendor_data_file dir b/129298416
hal_camera_default persist_file file b/123018469
hal_health_default persist_file dir b/127303305
hal_health_default persist_file file b/127303305
hal_health_default sysfs_usb_c dir b/126568362
+hal_health_default unlabeled file b/156200409
init sysfs_graphics file b/126568362
netmgrd system_file file b/117232795
platform_app vendor_default_prop file b/79617173
diff --git a/vendor/google/file.te b/vendor/google/file.te
index ae65f49..7a7d931 100644
--- a/vendor/google/file.te
+++ b/vendor/google/file.te
@@ -5,6 +5,3 @@
type sysfs_pixelstats, sysfs_type, fs_type;
type persist_battery_file, file_type;
type sysfs_chargelevel, sysfs_type, fs_type;
-
-# RamdumpFS
-allow ramdump_vendor_mnt_file self:filesystem associate;
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index 5b17328..e92b978 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -4,7 +4,7 @@
/dev/maxfg_history u:object_r:maxfg_device:s0
/vendor/bin/hw/android\.hardware\.atrace@1\.0-service.pixel u:object_r:hal_atrace_default_exec:s0
-/vendor/bin/hw/android\.hardware\.contexthub@1\.1-service\.generic u:object_r:hal_contexthub_default_exec:s0
+/vendor/bin/hw/android\.hardware\.contexthub@1\.2-service\.generic u:object_r:hal_contexthub_default_exec:s0
/vendor/bin/hw/android\.hardware\.secure_element@1\.1-service-disabled u:object_r:hal_secure_element_default_exec:s0
/vendor/bin/init\.firstboot\.sh u:object_r:init-firstboot_exec:s0
/vendor/bin/init\.fingerprint\.sh u:object_r:init-fingerprint_exec:s0
diff --git a/vendor/google/genfs_contexts b/vendor/google/genfs_contexts
index bfccebd..4243955 100644
--- a/vendor/google/genfs_contexts
+++ b/vendor/google/genfs_contexts
@@ -11,6 +11,9 @@
genfscon debugfs /logbuffer/usbpd u:object_r:debugfs_usb:s0
genfscon debugfs /logbuffer/wireless u:object_r:debugfs_usb:s0
+# Input
+genfscon sysfs /devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.1.auto/usb1 u:object_r:sysfs_uhid:s0
+
# Battery
genfscon sysfs /devices/platform/soc/soc:google,battery/power_supply/battery u:object_r:sysfs_batteryinfo:s0
genfscon sysfs /devices/platform/soc/880000.i2c/i2c-1/1-0061/power_supply/wireless u:object_r:sysfs_batteryinfo:s0
diff --git a/vendor/google/hal_identity_citadel.te b/vendor/google/hal_identity_citadel.te
deleted file mode 100644
index e29310c..0000000
--- a/vendor/google/hal_identity_citadel.te
+++ /dev/null
@@ -1,9 +0,0 @@
-type hal_identity_citadel, domain;
-type hal_identity_citadel_exec, exec_type, vendor_file_type, file_type;
-
-vndbinder_use(hal_identity_citadel)
-binder_call(hal_identity_citadel, citadeld)
-allow hal_identity_citadel citadeld_service:service_manager find;
-
-hal_server_domain(hal_identity_citadel, hal_identity)
-init_daemon_domain(hal_identity_citadel)
diff --git a/vendor/qcom/common/file.te b/vendor/qcom/common/file.te
index 9163a1d..14f4da8 100644
--- a/vendor/qcom/common/file.te
+++ b/vendor/qcom/common/file.te
@@ -93,8 +93,6 @@
type nfc_vendor_data_file, file_type, data_file_type;
type radio_vendor_data_file, file_type, data_file_type, mlstrustedobject;
type cnss_vendor_data_file, file_type, data_file_type, mlstrustedobject;
-type ramdump_vendor_data_file, file_type, data_file_type, mlstrustedobject;
-type ramdump_vendor_mnt_file, file_type, data_file_type, mlstrustedobject;
type wifidump_vendor_data_file, file_type, data_file_type;
type modem_dump_file, file_type, data_file_type;
type sensors_vendor_data_file, file_type, data_file_type;
diff --git a/vendor/qcom/common/file_contexts b/vendor/qcom/common/file_contexts
index 1f935e9..b2e5e22 100644
--- a/vendor/qcom/common/file_contexts
+++ b/vendor/qcom/common/file_contexts
@@ -72,12 +72,6 @@
# Block devices for the drive that holds the xbl_a and xbl_b partitions.
/dev/block/sd[bc]1? u:object_r:xbl_block_device:s0
-###################################
-# ramdumpfs files
-#
-/mnt/vendor/ramdump(/.*)? u:object_r:ramdump_vendor_mnt_file:s0
-/ramdump(/.*)? u:object_r:ramdump_vendor_mnt_file:s0
-
# Block device for hal_bootctl
/dev/block/sde u:object_r:boot_block_device:s0
@@ -106,7 +100,6 @@
/vendor/bin/netmgrd u:object_r:netmgrd_exec:s0
/vendor/bin/port-bridge u:object_r:port-bridge_exec:s0
/vendor/bin/qti u:object_r:qti_exec:s0
-/vendor/bin/ramdump u:object_r:ramdump_exec:s0
/vendor/bin/loc_launcher u:object_r:location_exec:s0
/vendor/bin/lowi-server u:object_r:location_exec:s0
/vendor/bin/xtra-daemon u:object_r:location_exec:s0
@@ -119,7 +112,7 @@
/vendor/bin/msm_irqbalance u:object_r:irqbalance_exec:s0
/vendor/bin/cnd u:object_r:cnd_exec:s0
/vendor/bin/easelmanagerd u:object_r:easel_exec:s0
-/vendor/bin/hw/android\.hardware\.usb@1\.2-service\.crosshatch u:object_r:hal_usb_impl_exec:s0
+/vendor/bin/hw/android\.hardware\.usb@1\.3-service\.crosshatch u:object_r:hal_usb_impl_exec:s0
/vendor/bin/chre u:object_r:chre_exec:s0
/vendor/bin/time_daemon u:object_r:time_daemon_exec:s0
/vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0
@@ -148,7 +141,7 @@
/vendor/bin/hw/android\.hardware\.health@2\.0-service\.crosshatch u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/vendor\.qti\.media\.c2@1\.0-service u:object_r:mediacodec_exec:s0
/vendor/bin/hw/vendor\.qti\.hardware\.display\.allocator@1\.0-service u:object_r:hal_graphics_allocator_default_exec:s0
-/vendor/bin/hw/vendor\.google\.wireless_charger@1\.2-service-vendor u:object_r:hal_wlc_exec:s0
+/vendor/bin/hw/vendor\.google\.wireless_charger@1\.3-service-vendor u:object_r:hal_wlc_exec:s0
/vendor/bin/hw/hardware\.google\.light@1\.0-service u:object_r:hal_light_default_exec:s0
###############################################
@@ -211,7 +204,6 @@
/data/vendor/radio(/.*)? u:object_r:radio_vendor_data_file:s0
/data/vendor/wifi/cnss_diag(/.*)? u:object_r:cnss_vendor_data_file:s0
/data/vendor/wifi/wlan_logs(/.*)? u:object_r:wifi_vendor_log_data_file:s0
-/data/vendor/ramdump(/.*)? u:object_r:ramdump_vendor_data_file:s0
/data/vendor/ssrdump(/.*)? u:object_r:ramdump_vendor_data_file:s0
/data/vendor/wifidump(/.*)? u:object_r:wifidump_vendor_data_file:s0
/data/vendor/modem_dump(/.*)? u:object_r:modem_dump_file:s0
diff --git a/vendor/qcom/common/logger_app.te b/vendor/qcom/common/logger_app.te
index 784e98e..9d8a58f 100644
--- a/vendor/qcom/common/logger_app.te
+++ b/vendor/qcom/common/logger_app.te
@@ -22,4 +22,5 @@
set_prop(logger_app, vendor_tcpdump_log_prop)
set_prop(logger_app, vendor_wifi_sniffer_prop)
set_prop(logger_app, vendor_usb_config_prop)
+ set_prop(logger_app, vendor_logging_prop)
')
diff --git a/vendor/qcom/common/mediatranscoding.te b/vendor/qcom/common/mediatranscoding.te
new file mode 100644
index 0000000..ab3f09d
--- /dev/null
+++ b/vendor/qcom/common/mediatranscoding.te
@@ -0,0 +1,2 @@
+get_prop(domain, vendor_display_prop)
+
diff --git a/vendor/qcom/common/property.te b/vendor/qcom/common/property.te
index 34291d1..fa98130 100644
--- a/vendor/qcom/common/property.te
+++ b/vendor/qcom/common/property.te
@@ -2,7 +2,6 @@
vendor_restricted_prop(cnd_prop)
vendor_restricted_prop(ims_prop)
vendor_internal_prop(vendor_dataqdp_prop)
-vendor_internal_prop(vendor_ramdump_prop)
vendor_restricted_prop(public_vendor_default_prop)
vendor_internal_prop(public_vendor_system_prop)
vendor_restricted_prop(vendor_ssr_prop)
diff --git a/vendor/qcom/common/property_contexts b/vendor/qcom/common/property_contexts
index 311cfd2..63dc2d1 100644
--- a/vendor/qcom/common/property_contexts
+++ b/vendor/qcom/common/property_contexts
@@ -8,9 +8,7 @@
vendor.ims. u:object_r:ims_prop:s0
persist.vendor.ims. u:object_r:ims_prop:s0
persist.net.doxlat u:object_r:vendor_net_radio_prop:s0
-vendor.debug.ramdump. u:object_r:vendor_ramdump_prop:s0
persist.vendor.sys.crash_rcu u:object_r:vendor_ramdump_prop:s0
-ro.boot.ramdump u:object_r:vendor_ramdump_prop:s0
vendor.debug.ssrdump u:object_r:vendor_ssr_prop:s0
persist.vendor.sys.cnss. u:object_r:vendor_cnss_diag_prop:s0
vendor.sys.listeners.registered u:object_r:vendor_tee_listener_prop:s0
diff --git a/vendor/qcom/common/ramdump.te b/vendor/qcom/common/ramdump.te
deleted file mode 100644
index 7b2e786..0000000
--- a/vendor/qcom/common/ramdump.te
+++ /dev/null
@@ -1,44 +0,0 @@
-type ramdump_exec, exec_type, vendor_file_type, file_type;
-
-userdebug_or_eng(`
- type ramdump, domain;
- init_daemon_domain(ramdump)
-
- set_prop(ramdump, vendor_ramdump_prop)
-
- # f2fs set pin file requires sys_admin
- allow ramdump self:capability sys_admin;
-
- allow ramdump self:capability sys_rawio;
-
- allow ramdump ramdump_vendor_data_file:dir create_dir_perms;
- allow ramdump ramdump_vendor_data_file:file create_file_perms;
- allow ramdump {
- proc
- proc_cmdline
- }:file r_file_perms;
-
- allow ramdump block_device:dir search;
- allow ramdump misc_block_device:blk_file rw_file_perms;
- allow ramdump userdata_block_device:blk_file rw_file_perms;
-
- dontaudit ramdump metadata_file:dir search;
-
- # read from /fstab.sdm845
- allow ramdump rootfs:file r_file_perms;
-
- r_dir_file(ramdump, sysfs_type)
-
- # To access statsd.
- hwbinder_use(ramdump)
- get_prop(ramdump, hwservicemanager_prop)
- allow ramdump fwk_stats_hwservice:hwservice_manager find;
- binder_call(ramdump, stats_service_server)
-
- # To implement fusefs (ramdumpfs) under /mnt/vendor/ramdump.
- allow ramdump fuse:filesystem relabelfrom;
- allow ramdump fuse_device:chr_file rw_file_perms;
- allow ramdump mnt_vendor_file:dir r_dir_perms;
- allow ramdump ramdump_vendor_mnt_file:dir { getattr mounton };
- allow ramdump ramdump_vendor_mnt_file:filesystem { mount unmount relabelfrom relabelto };
-')
