diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-09-11 20:31:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-11 20:31:36 +0000 |
| commit | 38cf5bf32f097c551546d4e4032231d8e2385c82 (patch) | |
| tree | 0f14913d4f03220a6427456032be5efa4aeeb620 /sepolicy | |
| parent | 3abc1c460fea4c383958f3795ebea58fe280f0be (diff) | |
| parent | 3d27a1962939aa706eadf110c2f15c6f294b5955 (diff) | |
| download | wahoo-38cf5bf32f097c551546d4e4032231d8e2385c82.tar.gz | |
Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
Diffstat (limited to 'sepolicy')
| -rw-r--r-- | sepolicy/public/te_macros | 9 | ||||
| -rw-r--r-- | sepolicy/vendor/con_monitor.te | 1 | ||||
| -rw-r--r-- | sepolicy/vendor/dumpstate.te | 4 | ||||
| -rw-r--r-- | sepolicy/vendor/property_contexts | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/sepolicy/public/te_macros b/sepolicy/public/te_macros new file mode 100644 index 00000000..701ef555 --- /dev/null +++ b/sepolicy/public/te_macros @@ -0,0 +1,9 @@ +########################################### +# dump_hal(hal_type) +# Ability to dump the hal debug info +# +define(`dump_hal', ` + hal_client_domain(dumpstate, $1); + allow $1_server dumpstate:fifo_file write; + allow $1_server dumpstate:fd use; +') diff --git a/sepolicy/vendor/con_monitor.te b/sepolicy/vendor/con_monitor.te index e1ba346c..eeb6bf5e 100644 --- a/sepolicy/vendor/con_monitor.te +++ b/sepolicy/vendor/con_monitor.te @@ -4,6 +4,7 @@ type con_monitor_app, domain; app_domain(con_monitor_app) set_prop(con_monitor_app, radio_prop) +userdebug_or_eng(`set_prop(con_monitor_app, dumpstate_options_prop)') allow con_monitor_app app_api_service:service_manager find; allow con_monitor_app radio_vendor_data_file:dir rw_dir_perms; allow con_monitor_app radio_vendor_data_file:file create_file_perms; diff --git a/sepolicy/vendor/dumpstate.te b/sepolicy/vendor/dumpstate.te index faa81a65..a0a8af40 100644 --- a/sepolicy/vendor/dumpstate.te +++ b/sepolicy/vendor/dumpstate.te @@ -1,3 +1,7 @@ +dump_hal(hal_thermal) +dump_hal(hal_power) +dump_hal(hal_power_stats) + userdebug_or_eng(` allow dumpstate proc_modules:file r_file_perms; allow dumpstate proc_stat:file r_file_perms; diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index 83081751..4e1447b7 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -64,7 +64,7 @@ vendor.gralloc.enable_ahardware_buffer u:object_r:public_vendor_default_prop:s0 # They are public_vendor_system_props for vendor-specific extension. sys.all.modules.ready u:object_r:public_vendor_system_prop:s0 sys.qcom.devup u:object_r:public_vendor_system_prop:s0 -sys.slpi.firmware.version u:object_r:public_vendor_system_prop:s0 +vendor.sys.slpi.firmware.version u:object_r:public_vendor_system_prop:s0 # vendor_default_prop # default_prop isn't accessible from vendor components. |