Merge "use dumpsate from gs-common" into udc-dev am: d186da49ea am: 9360e36aeb

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

Change-Id: I4b72ec7fd1edb52916c43e214a91505bddb024c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

whitechapel/vendor/google/file.te

@@ -101,7 +101,6 @@ type sysfs_pca, sysfs_type, fs_type;
 # Camera
 type persist_camera_file, file_type;
 type vendor_camera_tuning_file, vendor_file_type, file_type;
-type vendor_camera_data_file, file_type, data_file_type;
 type sysfs_camera, sysfs_type, fs_type;
 
 # GPS
@@ -172,11 +171,5 @@ type sysfs_trusty, sysfs_type, fs_type;
 # BootControl
 type sysfs_bootctl, sysfs_type, fs_type;
 
-# Radio
-type radio_vendor_data_file, file_type, data_file_type;
-userdebug_or_eng(`
-  typeattribute radio_vendor_data_file mlstrustedobject;
-')
-
 # WLC
 type sysfs_wlc, sysfs_type, fs_type;

whitechapel/vendor/google/file_contexts

@@ -161,7 +161,6 @@
 /vendor/lib64/camera/slider_.*\.binarypb                                u:object_r:vendor_camera_tuning_file:s0
 /vendor/bin/rlsservice                                                  u:object_r:rlsservice_exec:s0
 /mnt/vendor/persist/camera(/.*)?                                        u:object_r:persist_camera_file:s0
-/data/vendor/camera(/.*)?                                               u:object_r:vendor_camera_data_file:s0
 /vendor/lib(64)?/lib_aion_buffer\.so                                    u:object_r:same_process_hal_file:s0
 /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
@@ -379,5 +378,3 @@
 # Raw HID device
 /dev/hidraw[0-9]*                        u:object_r:hidraw_device:s0
 
-# Radio files.
-/data/vendor/radio(/.*)?                                                    u:object_r:radio_vendor_data_file:s0

whitechapel/vendor/google/hal_dumpstate_default.te

@@ -1,153 +0,0 @@
-allow hal_dumpstate_default sysfs_bcmdhd:dir search;
-allow hal_dumpstate_default sysfs_bcmdhd:file r_file_perms;
-
-allow hal_dumpstate_default sysfs_memory:file r_file_perms;
-allow hal_dumpstate_default sysfs_cpu:file r_file_perms;
-
-binder_use(hal_dumpstate_default)
-vndbinder_use(hal_dumpstate_default)
-
-allow hal_dumpstate_default vendor_gps_file:dir r_dir_perms;
-allow hal_dumpstate_default vendor_gps_file:file r_file_perms;
-
-allow hal_dumpstate_default sysfs_wlc:dir search;
-allow hal_dumpstate_default sysfs_wlc:dir r_dir_perms;
-allow hal_dumpstate_default sysfs_wlc:file r_file_perms;
-
-allow hal_dumpstate_default shell_data_file:file getattr;
-
-allow hal_dumpstate_default radio_vendor_data_file:dir create_dir_perms;
-allow hal_dumpstate_default radio_vendor_data_file:file create_file_perms;
-
-# camera debugging dump file access
-allow hal_dumpstate_default vendor_camera_data_file:dir r_dir_perms;
-allow hal_dumpstate_default vendor_camera_data_file:file r_file_perms;
-
-# camera prop access
-get_prop(hal_dumpstate_default, vendor_camera_debug_prop);
-
-allow hal_dumpstate_default vendor_log_file:dir search;
-
-allow hal_dumpstate_default vendor_dumpsys:file execute_no_trans;
-
-allow hal_dumpstate_default sysfs_acpm_stats:dir r_dir_perms;
-allow hal_dumpstate_default sysfs_acpm_stats:file r_file_perms;
-
-allow hal_dumpstate_default sysfs_spi:dir search;
-allow hal_dumpstate_default sysfs_spi:file rw_file_perms;
-
-allow hal_dumpstate_default logbuffer_device:chr_file r_file_perms;
-
-allow hal_dumpstate_default sysfs_wifi:dir search;
-allow hal_dumpstate_default sysfs_wifi:file r_file_perms;
-
-# Modem logs
-allow hal_dumpstate_default modem_efs_file:dir search;
-allow hal_dumpstate_default modem_efs_file:file r_file_perms;
-allow hal_dumpstate_default vendor_slog_file:file r_file_perms;
-
-allow hal_dumpstate_default block_device:dir r_dir_perms;
-
-allow hal_dumpstate_default proc_f2fs:dir r_dir_perms;
-allow hal_dumpstate_default proc_f2fs:file r_file_perms;
-
-allow hal_dumpstate_default sysfs_batteryinfo:dir search;
-allow hal_dumpstate_default sysfs_batteryinfo:dir r_dir_perms;
-allow hal_dumpstate_default sysfs_batteryinfo:file r_file_perms;
-
-allow hal_dumpstate_default vendor_toolbox_exec:file execute_no_trans;
-allow hal_dumpstate_default vendor_shell_exec:file execute_no_trans;
-
-allow hal_dumpstate_default proc_vendor_sched:file read;
-allow hal_dumpstate_default proc_vendor_sched:dir r_dir_perms;
-allow hal_dumpstate_default proc_vendor_sched:file r_file_perms;
-
-userdebug_or_eng(`
-  allow hal_dumpstate_default mnt_vendor_file:dir search;
-')
-
-get_prop(hal_dumpstate_default, vendor_gps_prop)
-set_prop(hal_dumpstate_default, vendor_modem_prop)
-get_prop(hal_dumpstate_default, vendor_rild_prop)
-set_prop(hal_dumpstate_default, vendor_logger_prop)
-
-userdebug_or_eng(`
-  allow hal_dumpstate_default vendor_ion_debugfs:dir r_dir_perms;
-  allow hal_dumpstate_default vendor_ion_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default sysfs_pixel_stat:dir r_dir_perms;
-  allow hal_dumpstate_default sysfs_pixel_stat:file r_file_perms;
-
-  allow hal_dumpstate_default vendor_pm_genpd_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default vendor_usb_debugfs:dir r_dir_perms;
-  allow hal_dumpstate_default vendor_usb_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default vendor_regmap_debugfs:dir r_dir_perms;
-  allow hal_dumpstate_default vendor_regmap_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default vendor_maxfg_debugfs:dir search;
-  allow hal_dumpstate_default vendor_maxfg_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default sysfs_vendor_metrics:dir search;
-  allow hal_dumpstate_default sysfs_vendor_metrics:file r_file_perms;
-
-  allow hal_dumpstate_default vendor_charger_debugfs:dir r_dir_perms;
-  allow hal_dumpstate_default vendor_charger_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default debugfs:dir r_dir_perms;
-  allow hal_dumpstate_default vendor_battery_debugfs:dir r_dir_perms;
-  allow hal_dumpstate_default vendor_battery_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default vendor_votable_debugfs:dir r_dir_perms;
-  allow hal_dumpstate_default vendor_votable_debugfs:file r_file_perms;
-
-  allow hal_dumpstate_default sysfs_bcl:dir r_dir_perms;
-  allow hal_dumpstate_default sysfs_bcl:file r_file_perms;
-  allow hal_dumpstate_default sysfs_bcl:lnk_file read;
-  allow hal_dumpstate_default tcpdump_vendor_data_file:dir create_dir_perms;
-  allow hal_dumpstate_default tcpdump_vendor_data_file:file create_file_perms;
-
-  set_prop(hal_dumpstate_default, vendor_tcpdump_log_prop)
-')
-
-dontaudit hal_dumpstate_default vendor_ion_debugfs:dir r_dir_perms;
-dontaudit hal_dumpstate_default vendor_ion_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default sysfs_pixel_stat:dir r_dir_perms;
-dontaudit hal_dumpstate_default sysfs_pixel_stat:file r_file_perms;
-
-dontaudit hal_dumpstate_default sysfs_vendor_metrics:dir search;
-dontaudit hal_dumpstate_default sysfs_vendor_metrics:file r_file_perms;
-
-dontaudit hal_dumpstate_default vendor_pm_genpd_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default vendor_usb_debugfs:dir r_dir_perms;
-dontaudit hal_dumpstate_default vendor_usb_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default vendor_regmap_debugfs:dir r_dir_perms;
-dontaudit hal_dumpstate_default vendor_regmap_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default vendor_maxfg_debugfs:dir search;
-dontaudit hal_dumpstate_default vendor_maxfg_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default vendor_charger_debugfs:dir r_dir_perms;
-dontaudit hal_dumpstate_default vendor_charger_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default debugfs:dir r_dir_perms;
-dontaudit hal_dumpstate_default vendor_battery_debugfs:dir r_dir_perms;
-dontaudit hal_dumpstate_default vendor_battery_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default vendor_votable_debugfs:dir r_dir_perms;
-dontaudit hal_dumpstate_default vendor_votable_debugfs:file r_file_perms;
-
-dontaudit hal_dumpstate_default mnt_vendor_file:dir r_dir_perms;
-
-dontaudit hal_dumpstate_default sysfs_bcl:dir r_dir_perms;
-dontaudit hal_dumpstate_default sysfs_bcl:file r_file_perms;
-
-dontaudit hal_dumpstate_default rootfs:dir r_dir_perms;
-
-dontaudit hal_dumpstate_default tcpdump_vendor_data_file:dir create_dir_perms;
-dontaudit hal_dumpstate_default tcpdump_vendor_data_file:file create_file_perms;
-dontaudit hal_dumpstate_default vendor_tcpdump_log_prop:file r_file_perms;

whitechapel/vendor/google/property.te

@@ -17,7 +17,6 @@ vendor_internal_prop(vendor_persist_sys_default_prop)
 vendor_internal_prop(vendor_codec2_debug_prop)
 vendor_internal_prop(vendor_display_prop)
 vendor_internal_prop(vendor_camera_prop)
-vendor_internal_prop(vendor_camera_debug_prop)
 vendor_internal_prop(vendor_camera_fatp_prop)
 vendor_internal_prop(vendor_gps_prop)
 
@@ -30,9 +29,6 @@ vendor_internal_prop(vendor_battery_profile_prop)
 # hal_health
 vendor_internal_prop(vendor_shutdown_prop)
 
-# Logger
-vendor_internal_prop(vendor_logger_prop)
-
 # NFC
 vendor_internal_prop(vendor_nfc_prop)
 

whitechapel/vendor/google/property_contexts

@@ -27,7 +27,6 @@ vendor.usb.            u:object_r:vendor_usb_config_prop:s0
 # for logger app
 vendor.pixellogger.          u:object_r:vendor_logger_prop:s0
 persist.vendor.pixellogger.  u:object_r:vendor_logger_prop:s0
-persist.vendor.verbose_logging_enabled u:object_r:vendor_logger_prop:s0
 
 # for cbd
 vendor.cbd.                  u:object_r:vendor_cbd_prop:s0
@@ -53,7 +52,6 @@ persist.vendor.display.                 u:object_r:vendor_display_prop:s0
 # for camera
 persist.vendor.camera.               u:object_r:vendor_camera_prop:s0
 vendor.camera.                       u:object_r:vendor_camera_prop:s0
-vendor.camera.debug.                 u:object_r:vendor_camera_debug_prop:s0
 vendor.camera.fatp.                  u:object_r:vendor_camera_fatp_prop:s0
 
 # for gps