diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-01 22:34:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-01 22:34:43 +0000 |
| commit | 26e9b0c6e75b0fb8163b37f5128f3d51f4fc72ce (patch) | |
| tree | 40e34d74ce19bf231e96394108bbabb156fbd74b | |
| parent | beb8a19dc05cb8a7b5a6ead48f3305684f78e768 (diff) | |
| parent | 0ab56badbe116b054bfe66ef2ca984eba399d87f (diff) | |
| download | marlin-26e9b0c6e75b0fb8163b37f5128f3d51f4fc72ce.tar.gz | |
Merge "Namespace ssrdump properties with vendor prefix" into pi-dev
| -rw-r--r-- | sepolicy/hal_bluetooth.te | 2 | ||||
| -rw-r--r-- | sepolicy/property.te | 2 | ||||
| -rw-r--r-- | sepolicy/property_contexts | 2 | ||||
| -rw-r--r-- | sepolicy/ssr_detector.te | 2 | ||||
| -rw-r--r-- | sepolicy/subsystem_ramdump.te | 2 | ||||
| -rw-r--r-- | sepolicy/wcnss_filter.te | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sepolicy/hal_bluetooth.te b/sepolicy/hal_bluetooth.te index a7aec21a..ea2c07f1 100644 --- a/sepolicy/hal_bluetooth.te +++ b/sepolicy/hal_bluetooth.te @@ -15,7 +15,7 @@ userdebug_or_eng(` allow hal_bluetooth sysfs_timestamp_switch:file r_file_perms; r_dir_file(hal_bluetooth, debugfs_ipc) r_dir_file(hal_bluetooth, sysfs_diag) - set_prop(hal_bluetooth, ssr_prop) + set_prop(hal_bluetooth, vendor_ssr_prop) ') dontaudit hal_bluetooth diag_device:chr_file rw_file_perms; diff --git a/sepolicy/property.te b/sepolicy/property.te index 51bd4cba..8beb15e0 100644 --- a/sepolicy/property.te +++ b/sepolicy/property.te @@ -3,7 +3,7 @@ type sensors_prop, property_type; type wc_prop, property_type; type hw_sku_prop, property_type; type mid_prop, property_type; -type ssr_prop, property_type; +type vendor_ssr_prop, property_type; type cnss_diag_prop, property_type; type thermal_prop, property_type; type vendor_ramdump_prop, property_type; diff --git a/sepolicy/property_contexts b/sepolicy/property_contexts index df3534b3..cb0b15d3 100644 --- a/sepolicy/property_contexts +++ b/sepolicy/property_contexts @@ -7,7 +7,7 @@ radio. u:object_r:radio_prop:s0 rcs.publish.status u:object_r:radio_prop:s0 ro.boot.hardware.sku u:object_r:hw_sku_prop:s0 ro.boot.mid u:object_r:mid_prop:s0 -debug.ssrdump u:object_r:ssr_prop:s0 +vendor.debug.ssrdump u:object_r:vendor_ssr_prop:s0 persist.sys.cnss. u:object_r:cnss_diag_prop:s0 vendor.debug.ramdump. u:object_r:vendor_ramdump_prop:s0 persist.vendor.sys.crash_rcu u:object_r:vendor_ramdump_prop:s0 diff --git a/sepolicy/ssr_detector.te b/sepolicy/ssr_detector.te index d3db3eea..6998b144 100644 --- a/sepolicy/ssr_detector.te +++ b/sepolicy/ssr_detector.te @@ -6,7 +6,7 @@ app_domain(ssr_detector) userdebug_or_eng(` allow ssr_detector ramdump_vendor_data_file:dir r_dir_perms; allow ssr_detector ramdump_vendor_data_file:file r_file_perms; - get_prop(ssr_detector, ssr_prop) + get_prop(ssr_detector, vendor_ssr_prop) ') allow ssr_detector { app_api_service }:service_manager find; diff --git a/sepolicy/subsystem_ramdump.te b/sepolicy/subsystem_ramdump.te index 9a6e665e..a780505e 100644 --- a/sepolicy/subsystem_ramdump.te +++ b/sepolicy/subsystem_ramdump.te @@ -12,5 +12,5 @@ userdebug_or_eng(` allow subsystem_ramdump ramdump_vendor_data_file:dir rw_dir_perms; allow subsystem_ramdump ramdump_vendor_data_file:file create_file_perms; - set_prop(subsystem_ramdump, ssr_prop) + set_prop(subsystem_ramdump, vendor_ssr_prop) ') diff --git a/sepolicy/wcnss_filter.te b/sepolicy/wcnss_filter.te index a657c91c..17bc2d2e 100644 --- a/sepolicy/wcnss_filter.te +++ b/sepolicy/wcnss_filter.te @@ -20,7 +20,7 @@ userdebug_or_eng(` allow wcnss_filter ramdump_vendor_data_file:dir w_dir_perms; allow wcnss_filter ramdump_vendor_data_file:file { create w_file_perms }; r_dir_file(wcnss_filter, debugfs_ipc) - set_prop(wcnss_filter, ssr_prop) + set_prop(wcnss_filter, vendor_ssr_prop) ') dontaudit wcnss_filter diag_device:chr_file rw_file_perms; |