From aff9f380d301b6c6e5ae6d04f06c1035b7b5463c Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 24 Oct 2022 13:17:40 +0800 Subject: [PATCH] review ssr_detector_app Bug: 254378739 Test: boot with ssr app correctly labeled Change-Id: I28581c15cf0f7ecb01cbd11c747ad338b157e1c8 --- legacy/private/service_contexts | 1 - legacy/whitechapel_pro/file.te | 11 ----------- legacy/whitechapel_pro/genfs_contexts | 4 ---- legacy/whitechapel_pro/property.te | 2 -- legacy/whitechapel_pro/property_contexts | 8 -------- legacy/whitechapel_pro/seapp_contexts | 3 --- vendor/file.te | 11 +++++++++++ vendor/genfs_contexts | 4 ++++ vendor/property.te | 2 ++ vendor/property_contexts | 8 ++++++++ vendor/seapp_contexts | 2 ++ {legacy/whitechapel_pro => vendor}/ssr_detector.te | 0 12 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 legacy/private/service_contexts create mode 100644 vendor/genfs_contexts create mode 100644 vendor/seapp_contexts rename {legacy/whitechapel_pro => vendor}/ssr_detector.te (100%) diff --git a/legacy/private/service_contexts b/legacy/private/service_contexts deleted file mode 100644 index 8877518a..00000000 --- a/legacy/private/service_contexts +++ /dev/null @@ -1 +0,0 @@ -telephony.oem.oemrilhook u:object_r:radio_service:s0 diff --git a/legacy/whitechapel_pro/file.te b/legacy/whitechapel_pro/file.te index 20f386c2..f9ea082d 100644 --- a/legacy/whitechapel_pro/file.te +++ b/legacy/whitechapel_pro/file.te @@ -77,17 +77,6 @@ type modem_userdata_file, file_type; type sysfs_st33spi, sysfs_type, fs_type; typeattribute sysfs_st33spi mlstrustedobject; -# Vendor sched files -userdebug_or_eng(` - typeattribute proc_vendor_sched mlstrustedobject; -') - -# SJTAG -type sysfs_sjtag, fs_type, sysfs_type; -userdebug_or_eng(` - typeattribute sysfs_sjtag mlstrustedobject; -') - # USB-C throttling stats type sysfs_usbc_throttling_stats, sysfs_type, fs_type; diff --git a/legacy/whitechapel_pro/genfs_contexts b/legacy/whitechapel_pro/genfs_contexts index c6eecd3f..3bd00026 100644 --- a/legacy/whitechapel_pro/genfs_contexts +++ b/legacy/whitechapel_pro/genfs_contexts @@ -314,10 +314,6 @@ genfscon sysfs /thermal_zone14/mode u:obj genfscon sysfs /devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq u:object_r:sysfs_camera:s0 genfscon sysfs /devices/platform/17000060.devfreq_tnr/devfreq/17000060.devfreq_tnr/min_freq u:object_r:sysfs_camera:s0 -# SJTAG -genfscon sysfs /devices/platform/sjtag_ap/interface u:object_r:sysfs_sjtag:s0 -genfscon sysfs /devices/platform/sjtag_gsa/interface u:object_r:sysfs_sjtag:s0 - # USB-C throttling stats genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/cleared_time u:object_r:sysfs_usbc_throttling_stats:s0 genfscon sysfs /devices/platform/google,usbc_port_cooling_dev/hysteresis_time u:object_r:sysfs_usbc_throttling_stats:s0 diff --git a/legacy/whitechapel_pro/property.te b/legacy/whitechapel_pro/property.te index 5d7f16ee..e817bb6a 100644 --- a/legacy/whitechapel_pro/property.te +++ b/legacy/whitechapel_pro/property.te @@ -3,8 +3,6 @@ vendor_internal_prop(vendor_slog_prop) vendor_internal_prop(vendor_persist_config_default_prop) vendor_internal_prop(vendor_cbd_prop) vendor_internal_prop(vendor_carrier_prop) -vendor_internal_prop(vendor_ssrdump_prop) -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) diff --git a/legacy/whitechapel_pro/property_contexts b/legacy/whitechapel_pro/property_contexts index d26b161d..bf2e8886 100644 --- a/legacy/whitechapel_pro/property_contexts +++ b/legacy/whitechapel_pro/property_contexts @@ -25,10 +25,6 @@ ro.vendor.config.build_carrier u:object_r:vendor_carrier_prop:s0 persist.vendor.config. u:object_r:vendor_persist_config_default_prop:s0 -# SSR Detector -vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 -persist.vendor.sys.ssr. u:object_r:vendor_ssrdump_prop:s0 - # test battery profile persist.vendor.testing_battery_profile u:object_r:vendor_battery_profile_prop:s0 @@ -41,10 +37,6 @@ persist.vendor.nfc. u:object_r:vendor_nfc_prop:s0 # SecureElement persist.vendor.se. u:object_r:vendor_secure_element_prop:s0 -# WiFi -vendor.wlan.driver.version u:object_r:vendor_wifi_version:s0 -vendor.wlan.firmware.version u:object_r:vendor_wifi_version:s0 - # for display ro.vendor.hwc.drm.device u:object_r:vendor_display_prop:s0 persist.vendor.display. u:object_r:vendor_display_prop:s0 diff --git a/legacy/whitechapel_pro/seapp_contexts b/legacy/whitechapel_pro/seapp_contexts index 72b0b6c9..f1082c60 100644 --- a/legacy/whitechapel_pro/seapp_contexts +++ b/legacy/whitechapel_pro/seapp_contexts @@ -48,9 +48,6 @@ user=_app isPrivApp=true seinfo=uwb name=com.qorvo.uwb.vendorservice domain=uwb_ # Domain for EuiccSupportPixel user=_app isPrivApp=true seinfo=EuiccSupportPixel name=com.google.euiccpixel domain=euiccpixel_app type=app_data_file levelFrom=all -# Sub System Ramdump -user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user - # Google Camera user=_app isPrivApp=true seinfo=google name=com.google.android.GoogleCamera domain=google_camera_app type=app_data_file levelFrom=all diff --git a/vendor/file.te b/vendor/file.te index 990bfbf7..3d5739d5 100644 --- a/vendor/file.te +++ b/vendor/file.te @@ -16,3 +16,14 @@ type vendor_fw_file, vendor_file_type, file_type; type modem_img_file, contextmount_type, file_type, vendor_file_type; allow modem_img_file self:filesystem associate; +# sysfs +type sysfs_sjtag, fs_type, sysfs_type; +userdebug_or_eng(` + typeattribute sysfs_sjtag mlstrustedobject; +') + +# Vendor sched files +userdebug_or_eng(` + typeattribute proc_vendor_sched mlstrustedobject; +') + diff --git a/vendor/genfs_contexts b/vendor/genfs_contexts new file mode 100644 index 00000000..cdf5fc21 --- /dev/null +++ b/vendor/genfs_contexts @@ -0,0 +1,4 @@ +# SJTAG +genfscon sysfs /devices/platform/sjtag_ap/interface u:object_r:sysfs_sjtag:s0 +genfscon sysfs /devices/platform/sjtag_gsa/interface u:object_r:sysfs_sjtag:s0 + diff --git a/vendor/property.te b/vendor/property.te index 533301b4..29f53f12 100644 --- a/vendor/property.te +++ b/vendor/property.te @@ -1,2 +1,4 @@ vendor_internal_prop(vendor_modem_prop) vendor_internal_prop(vendor_rild_prop) +vendor_internal_prop(vendor_ssrdump_prop) +vendor_internal_prop(vendor_wifi_version) diff --git a/vendor/property_contexts b/vendor/property_contexts index 1d2fdaca..f24f8db5 100644 --- a/vendor/property_contexts +++ b/vendor/property_contexts @@ -14,3 +14,11 @@ vendor.radio. u:object_r:vendor_rild_prop:s0 vendor.sys.rild_reset u:object_r:vendor_rild_prop:s0 persist.vendor.radio. u:object_r:vendor_rild_prop:s0 +# SSR Detector +vendor.debug.ssrdump. u:object_r:vendor_ssrdump_prop:s0 +persist.vendor.sys.ssr. u:object_r:vendor_ssrdump_prop:s0 + +# WiFi +vendor.wlan.driver.version u:object_r:vendor_wifi_version:s0 +vendor.wlan.firmware.version u:object_r:vendor_wifi_version:s0 + diff --git a/vendor/seapp_contexts b/vendor/seapp_contexts new file mode 100644 index 00000000..71b15ef6 --- /dev/null +++ b/vendor/seapp_contexts @@ -0,0 +1,2 @@ +# Sub System Ramdump +user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user diff --git a/legacy/whitechapel_pro/ssr_detector.te b/vendor/ssr_detector.te similarity index 100% rename from legacy/whitechapel_pro/ssr_detector.te rename to vendor/ssr_detector.te