From 256795caa70d6da0e36aedd445e2ed10559c9344 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 14 Sep 2021 11:54:56 +0800 Subject: [PATCH] review SSR app Bug: 198532074 Test: boot with SSR app labeled Change-Id: I7fd0765ffdcc5632be1c91a28de25c6e1e531e26 --- legacy/file.te | 1 - legacy/genfs_contexts | 1 - legacy/property.te | 4 ---- legacy/property_contexts | 8 -------- legacy/seapp_contexts | 1 - legacy/vendor_init.te | 1 - whitechapel_pro/property.te | 2 ++ whitechapel_pro/property_contexts | 8 ++++++++ whitechapel_pro/seapp_contexts | 3 +++ {legacy => whitechapel_pro}/ssr_detector.te | 2 -- whitechapel_pro/vendor_init.te | 1 + 11 files changed, 14 insertions(+), 18 deletions(-) rename {legacy => whitechapel_pro}/ssr_detector.te (84%) diff --git a/legacy/file.te b/legacy/file.te index a2a26abc..a2eb405b 100644 --- a/legacy/file.te +++ b/legacy/file.te @@ -23,7 +23,6 @@ type vendor_maxfg_debugfs, fs_type, debugfs_type; type vendor_charger_debugfs, fs_type, debugfs_type; type vendor_votable_debugfs, fs_type, debugfs_type; type vendor_battery_debugfs, fs_type, debugfs_type; -type vendor_sjtag_debugfs, fs_type, debugfs_type; # Exynos sysfs type sysfs_exynos_bts, sysfs_type, fs_type; diff --git a/legacy/genfs_contexts b/legacy/genfs_contexts index cbc266d7..51dcf58b 100644 --- a/legacy/genfs_contexts +++ b/legacy/genfs_contexts @@ -250,7 +250,6 @@ genfscon debugfs /usb genfscon debugfs /google_charger u:object_r:vendor_charger_debugfs:s0 genfscon debugfs /gvotables u:object_r:vendor_votable_debugfs:s0 genfscon debugfs /google_battery u:object_r:vendor_battery_debugfs:s0 -genfscon debugfs /sjtag u:object_r:vendor_sjtag_debugfs:s0 # tracefs genfscon tracefs /events/dmabuf_heap/dma_heap_stat u:object_r:debugfs_tracing:s0 diff --git a/legacy/property.te b/legacy/property.te index a66a947a..28ce2e9f 100644 --- a/legacy/property.te +++ b/legacy/property.te @@ -1,7 +1,6 @@ # For Exynos Properties vendor_internal_prop(vendor_prop) vendor_internal_prop(sensors_prop) -vendor_internal_prop(vendor_ssrdump_prop) vendor_internal_prop(vendor_device_prop) vendor_internal_prop(vendor_usb_config_prop) vendor_internal_prop(vendor_secure_element_prop) @@ -28,9 +27,6 @@ vendor_internal_prop(vendor_logger_prop) # NFC vendor_internal_prop(vendor_nfc_prop) -# WiFi -vendor_internal_prop(vendor_wifi_version) - # Touchpanel vendor_internal_prop(vendor_touchpanel_prop) diff --git a/legacy/property_contexts b/legacy/property_contexts index 7244e74b..c00cfe88 100644 --- a/legacy/property_contexts +++ b/legacy/property_contexts @@ -1,10 +1,6 @@ # Ramdump persist.vendor.sys.crash_rcu u:object_r:vendor_ramdump_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 - # Kernel modules related vendor.common.modules.ready u:object_r:vendor_device_prop:s0 vendor.device.modules.ready u:object_r:vendor_device_prop:s0 @@ -53,10 +49,6 @@ vendor.battery.defender. u:object_r:vendor_battery_defend # test battery profile persist.vendor.testing_battery_profile u:object_r:vendor_battery_profile_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 - # Touchpanel vendor.mfgapi.touchpanel.permission u:object_r:vendor_touchpanel_prop:s0 diff --git a/legacy/seapp_contexts b/legacy/seapp_contexts index a30552b7..90b10346 100644 --- a/legacy/seapp_contexts +++ b/legacy/seapp_contexts @@ -1,5 +1,4 @@ # coredump/ramdump -user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user user=_app seinfo=platform name=com.android.ramdump domain=ramdump_app type=app_data_file levelFrom=all # HbmSVManager diff --git a/legacy/vendor_init.te b/legacy/vendor_init.te index 94b7d9ec..70d06de9 100644 --- a/legacy/vendor_init.te +++ b/legacy/vendor_init.te @@ -3,7 +3,6 @@ set_prop(vendor_init, vendor_modem_prop) set_prop(vendor_init, vendor_rild_prop) set_prop(vendor_init, vendor_usb_config_prop) set_prop(vendor_init, vendor_slog_prop) -set_prop(vendor_init, vendor_ssrdump_prop) get_prop(vendor_init, vendor_touchpanel_prop) set_prop(vendor_init, vendor_tcpdump_log_prop) set_prop(vendor_init, vendor_thermal_prop) diff --git a/whitechapel_pro/property.te b/whitechapel_pro/property.te index 3c806615..5b1caef3 100644 --- a/whitechapel_pro/property.te +++ b/whitechapel_pro/property.te @@ -5,4 +5,6 @@ vendor_internal_prop(vendor_persist_config_default_prop) vendor_internal_prop(vendor_cbd_prop) vendor_internal_prop(vendor_rild_prop) vendor_internal_prop(vendor_carrier_prop) +vendor_internal_prop(vendor_ssrdump_prop) +vendor_internal_prop(vendor_wifi_version) diff --git a/whitechapel_pro/property_contexts b/whitechapel_pro/property_contexts index f2af0320..9b013132 100644 --- a/whitechapel_pro/property_contexts +++ b/whitechapel_pro/property_contexts @@ -29,3 +29,11 @@ vendor.sys.rild_reset u:object_r:vendor_rild_prop:s0 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 + +# 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/whitechapel_pro/seapp_contexts b/whitechapel_pro/seapp_contexts index 520cbf12..23acc183 100644 --- a/whitechapel_pro/seapp_contexts +++ b/whitechapel_pro/seapp_contexts @@ -22,3 +22,6 @@ user=_app isPrivApp=true seinfo=mds name=com.google.mds domain=modem_diagnostic_ # CBRS setup app user=_app seinfo=platform name=com.google.googlecbrs domain=cbrs_setup_app type=app_data_file levelFrom=user + +# 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/ssr_detector.te b/whitechapel_pro/ssr_detector.te similarity index 84% rename from legacy/ssr_detector.te rename to whitechapel_pro/ssr_detector.te index 37f571cd..ff3c40f9 100644 --- a/legacy/ssr_detector.te +++ b/whitechapel_pro/ssr_detector.te @@ -12,8 +12,6 @@ userdebug_or_eng(` allow ssr_detector_app sscoredump_vendor_data_coredump_file:dir r_dir_perms; allow ssr_detector_app sscoredump_vendor_data_coredump_file:file r_file_perms; get_prop(ssr_detector_app, vendor_aoc_prop) - allow ssr_detector_app vendor_sjtag_debugfs:dir r_dir_perms; - allow ssr_detector_app vendor_sjtag_debugfs:file rw_file_perms; ') get_prop(ssr_detector_app, vendor_ssrdump_prop) diff --git a/whitechapel_pro/vendor_init.te b/whitechapel_pro/vendor_init.te index f0c6b6bf..c8a8d3c0 100644 --- a/whitechapel_pro/vendor_init.te +++ b/whitechapel_pro/vendor_init.te @@ -1,4 +1,5 @@ allow vendor_init bootdevice_sysdev:file create_file_perms; +set_prop(vendor_init, vendor_ssrdump_prop) set_prop(vendor_init, vendor_carrier_prop) set_prop(vendor_init, vendor_cbd_prop)