From ad68e7dc96c8261a2d4e87ce1dfdcff6de3f95ca Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 27 Sep 2021 10:07:37 +0800 Subject: [PATCH] remove hal_health_default It will be easier to review it through boot test Bug: 201230944 Test: boot to home Change-Id: I5008c4054ce04f062a8ca01a1e2bfd4cfe8daf70 --- legacy/file.te | 4 ---- legacy/file_contexts | 8 -------- legacy/genfs_contexts | 14 -------------- legacy/hal_health_default.te | 14 -------------- legacy/property.te | 3 --- legacy/property_contexts | 3 --- whitechapel_pro/file.te | 2 ++ whitechapel_pro/file_contexts | 1 + whitechapel_pro/genfs_contexts | 16 ++++++++++++++++ whitechapel_pro/property.te | 1 + whitechapel_pro/property_contexts | 3 +++ 11 files changed, 23 insertions(+), 46 deletions(-) delete mode 100644 legacy/hal_health_default.te diff --git a/legacy/file.te b/legacy/file.te index 7938444f..089cb81a 100644 --- a/legacy/file.te +++ b/legacy/file.te @@ -58,7 +58,6 @@ type sysfs_wifi, sysfs_type, fs_type; type updated_wifi_firmware_data_file, file_type, data_file_type; # Storage Health HAL -type sysfs_scsi_devices_0000, sysfs_type, fs_type; type debugfs_f2fs, debugfs_type, fs_type; type proc_f2fs, proc_type, fs_type; @@ -99,9 +98,6 @@ type sysfs_bcl, sysfs_type, fs_type; type sysfs_chip_id, sysfs_type, fs_type; type sysfs_spi, sysfs_type, fs_type; -# Battery -type persist_battery_file, file_type, vendor_persist_type; - # CPU type sysfs_cpu, sysfs_type, fs_type; diff --git a/legacy/file_contexts b/legacy/file_contexts index b012c7cf..5b23d699 100644 --- a/legacy/file_contexts +++ b/legacy/file_contexts @@ -110,11 +110,6 @@ /vendor/bin/hw/google\.hardware\.media\.c2@1\.0-service u:object_r:mediacodec_exec:s0 /data/vendor/media(/.*)? u:object_r:vendor_media_data_file:s0 -# thermal sysfs files -/sys/class/thermal(/.*)? u:object_r:sysfs_thermal:s0 -/sys/devices/virtual/thermal(/.*)? u:object_r:sysfs_thermal:s0 - - # IMS VoWiFi /data/vendor/misc(/.*)? u:object_r:vendor_misc_data_file:s0 /data/vendor/VoWiFi(/.*)? u:object_r:vendor_ims_data_file:s0 @@ -151,9 +146,6 @@ /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty u:object_r:hal_keymint_default_exec:s0 /dev/trusty-log0 u:object_r:logbuffer_device:s0 -# Battery -/mnt/vendor/persist/battery(/.*)? u:object_r:persist_battery_file:s0 - # GRIL /vendor/bin/hw/vendor\.google\.radioext@1\.0-service u:object_r:hal_radioext_default_exec:s0 diff --git a/legacy/genfs_contexts b/legacy/genfs_contexts index c6c005b1..10f8d01f 100644 --- a/legacy/genfs_contexts +++ b/legacy/genfs_contexts @@ -7,20 +7,6 @@ genfscon sysfs /devices/platform/10d30000.spi/spi_master/spi10/spi10.0/uwb/power genfscon debugfs /f2fs u:object_r:debugfs_f2fs:s0 genfscon proc /fs/f2fs u:object_r:proc_f2fs:s0 genfscon proc /sys/vm/swappiness u:object_r:proc_dirty:s0 -genfscon sysfs /devices/platform/14700000.ufs/slowio_read_cnt u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/slowio_write_cnt u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/slowio_unmap_cnt u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/slowio_sync_cnt u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/manual_gc u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/io_stats u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/req_stats u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/err_stats u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/device_descriptor u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/clkgate_enable u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/hibern8_on_idle_enable u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/health_descriptor u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/host0/target0:0:0/0:0:0: u:object_r:sysfs_scsi_devices_0000:s0 -genfscon sysfs /devices/platform/14700000.ufs/ufs_stats u:object_r:sysfs_scsi_devices_0000:s0 # Tethering genfscon sysfs /devices/platform/11210000.usb/11210000.dwc3/gadget/net u:object_r:sysfs_net:s0 diff --git a/legacy/hal_health_default.te b/legacy/hal_health_default.te deleted file mode 100644 index a684dcc2..00000000 --- a/legacy/hal_health_default.te +++ /dev/null @@ -1,14 +0,0 @@ -allow hal_health_default mnt_vendor_file:dir search; -allow hal_health_default persist_file:dir search; -allow hal_health_default persist_battery_file:file create_file_perms; -allow hal_health_default persist_battery_file:dir rw_dir_perms; - -set_prop(hal_health_default, vendor_battery_defender_prop) -r_dir_file(hal_health_default, sysfs_scsi_devices_0000) - -allow hal_health_default sysfs_wlc:dir search; -allow hal_health_default sysfs_batteryinfo:file w_file_perms; -allow hal_health_default sysfs_thermal:dir search; -allow hal_health_default sysfs_thermal:file w_file_perms; -allow hal_health_default sysfs_thermal:lnk_file read; -allow hal_health_default thermal_link_device:dir search; diff --git a/legacy/property.te b/legacy/property.te index 0218944d..67cdc061 100644 --- a/legacy/property.te +++ b/legacy/property.te @@ -14,9 +14,6 @@ vendor_internal_prop(vendor_camera_debug_prop) vendor_internal_prop(vendor_camera_fatp_prop) vendor_internal_prop(vendor_gps_prop) -# Battery defender -vendor_internal_prop(vendor_battery_defender_prop) - # Logger vendor_internal_prop(vendor_logger_prop) diff --git a/legacy/property_contexts b/legacy/property_contexts index 5a5cb4cc..60fe7594 100644 --- a/legacy/property_contexts +++ b/legacy/property_contexts @@ -37,9 +37,6 @@ vendor.camera.fatp. u:object_r:vendor_camera_fatp_prop:s0 # for gps vendor.gps u:object_r:vendor_gps_prop:s0 -# Battery -vendor.battery.defender. u:object_r:vendor_battery_defender_prop:s0 - # Touchpanel vendor.mfgapi.touchpanel.permission u:object_r:vendor_touchpanel_prop:s0 diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te index e12181d1..27e8be52 100644 --- a/whitechapel_pro/file.te +++ b/whitechapel_pro/file.te @@ -18,6 +18,7 @@ type sysfs_chosen, sysfs_type, fs_type; type sysfs_ota, sysfs_type, fs_type; type bootdevice_sysdev, dev_type; type sysfs_display, sysfs_type, fs_type; +type sysfs_scsi_devices_0000, sysfs_type, fs_type; # vendor extra images type modem_img_file, contextmount_type, file_type, vendor_file_type; @@ -26,6 +27,7 @@ allow modem_img_file self:filesystem associate; # persist type persist_modem_file, file_type, vendor_persist_type; type persist_ss_file, file_type, vendor_persist_type; +type persist_battery_file, file_type, vendor_persist_type; # CHRE type chre_socket, file_type; diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index ee09864b..274c6793 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -84,6 +84,7 @@ # Persist /mnt/vendor/persist/modem(/.*)? u:object_r:persist_modem_file:s0 /mnt/vendor/persist/ss(/.*)? u:object_r:persist_ss_file:s0 +/mnt/vendor/persist/battery(/.*)? u:object_r:persist_battery_file:s0 # Extra mount images /mnt/vendor/modem_img(/.*)? u:object_r:modem_img_file:s0 diff --git a/whitechapel_pro/genfs_contexts b/whitechapel_pro/genfs_contexts index 3cd39732..28d6907e 100644 --- a/whitechapel_pro/genfs_contexts +++ b/whitechapel_pro/genfs_contexts @@ -7,3 +7,19 @@ genfscon sysfs /devices/platform/14700000.ufs/pixel/boot_lun_enabled u genfscon sysfs /devices/platform/1c2c0000.drmdsim/1c2c0000.drmdsim.0/gamma u:object_r:sysfs_display:s0 genfscon sysfs /devices/platform/1c2c0000.drmdsim/hs_clock u:object_r:sysfs_display:s0 +# Storage +genfscon sysfs /devices/platform/14700000.ufs/slowio_read_cnt u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/slowio_write_cnt u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/slowio_unmap_cnt u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/slowio_sync_cnt u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/manual_gc u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/io_stats u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/req_stats u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/err_stats u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/device_descriptor u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/clkgate_enable u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/hibern8_on_idle_enable u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/health_descriptor u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/host0/target0:0:0/0:0:0: u:object_r:sysfs_scsi_devices_0000:s0 +genfscon sysfs /devices/platform/14700000.ufs/ufs_stats u:object_r:sysfs_scsi_devices_0000:s0 + diff --git a/whitechapel_pro/property.te b/whitechapel_pro/property.te index 6f716705..ca8bd10c 100644 --- a/whitechapel_pro/property.te +++ b/whitechapel_pro/property.te @@ -10,4 +10,5 @@ vendor_internal_prop(vendor_wifi_version) vendor_internal_prop(vendor_nfc_prop) vendor_internal_prop(vendor_secure_element_prop) vendor_internal_prop(vendor_battery_profile_prop) +vendor_internal_prop(vendor_battery_defender_prop) diff --git a/whitechapel_pro/property_contexts b/whitechapel_pro/property_contexts index 9a5b6bd3..e0ea01fd 100644 --- a/whitechapel_pro/property_contexts +++ b/whitechapel_pro/property_contexts @@ -36,6 +36,9 @@ vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 # test battery profile persist.vendor.testing_battery_profile u:object_r:vendor_battery_profile_prop:s0 +# Battery +vendor.battery.defender. u:object_r:vendor_battery_defender_prop:s0 + # NFC persist.vendor.nfc. u:object_r:vendor_nfc_prop:s0