Merge "Allow vendor-init-settable to persist.radio.multisim.config"

am: c22f971195

Change-Id: I497dcd53fecb0cde875be8900e969a79ee532546
This commit is contained in:
Jaekyun Seok 2018-03-28 04:04:32 +00:00 committed by android-build-merger
commit 66a8672393
8 changed files with 11 additions and 1 deletions

View file

@ -37,6 +37,7 @@
exported2_system_prop
exported2_vold_prop
exported3_default_prop
exported3_radio_prop
exported3_system_prop
fs_bpf
hal_authsecret_hwservice

View file

@ -20,6 +20,7 @@
exported2_system_prop
exported2_vold_prop
exported3_default_prop
exported3_radio_prop
exported3_system_prop
exported_config_prop
exported_dalvik_prop

View file

@ -95,6 +95,7 @@ not_compatible_property(`
get_prop(domain, exported2_system_prop)
get_prop(domain, exported2_vold_prop)
get_prop(domain, exported3_default_prop)
get_prop(domain, exported3_radio_prop)
get_prop(domain, exported3_system_prop)
get_prop(domain, vendor_default_prop)
')
@ -108,6 +109,7 @@ compatible_property_only(`
get_prop({coredomain appdomain shell}, exported2_system_prop)
get_prop({coredomain appdomain shell}, exported2_vold_prop)
get_prop({coredomain appdomain shell}, exported3_default_prop)
get_prop({coredomain appdomain shell}, exported3_radio_prop)
get_prop({coredomain appdomain shell}, exported3_system_prop)
userdebug_or_eng(`
get_prop(su, core_property_type)
@ -119,6 +121,7 @@ compatible_property_only(`
get_prop(su, exported2_system_prop)
get_prop(su, exported2_vold_prop)
get_prop(su, exported3_default_prop)
get_prop(su, exported3_radio_prop)
get_prop(su, exported3_system_prop)
')
get_prop({domain -coredomain -appdomain}, vendor_default_prop)

View file

@ -27,6 +27,7 @@ allow hal_telephony_server sdcard_type:dir r_dir_perms;
set_prop(hal_telephony_server, radio_prop)
set_prop(hal_telephony_server, exported_radio_prop)
set_prop(hal_telephony_server, exported2_radio_prop)
set_prop(hal_telephony_server, exported3_radio_prop)
allow hal_telephony_server tty_device:chr_file rw_file_perms;

View file

@ -73,6 +73,7 @@ type exported2_radio_prop, property_type;
type exported2_system_prop, property_type;
type exported2_vold_prop, property_type;
type exported3_default_prop, property_type;
type exported3_radio_prop, property_type;
type exported3_system_prop, property_type;
type vendor_default_prop, property_type;
@ -164,6 +165,7 @@ compatible_property_only(`
} {
exported_radio_prop
exported2_radio_prop
exported3_radio_prop
radio_prop
}:property_service set;

View file

@ -1,6 +1,5 @@
# vendor-init-readable
persist.radio.airplane_mode_on u:object_r:exported2_radio_prop:s0 exact int
persist.radio.multisim.config u:object_r:exported2_radio_prop:s0 exact string
# vendor-init-settable
af.fast_track_multiplier u:object_r:exported3_default_prop:s0 exact int
@ -67,6 +66,7 @@ persist.config.calibration_fac u:object_r:exported3_default_prop:s0 exact string
persist.dbg.volte_avail_ovr u:object_r:exported3_default_prop:s0 exact int
persist.dbg.vt_avail_ovr u:object_r:exported3_default_prop:s0 exact int
persist.dbg.wfc_avail_ovr u:object_r:exported3_default_prop:s0 exact int
persist.radio.multisim.config u:object_r:exported3_radio_prop:s0 exact string
persist.sys.dalvik.vm.lib.2 u:object_r:exported2_system_prop:s0 exact string
persist.sys.sf.color_saturation u:object_r:exported2_system_prop:s0 exact string
pm.dexopt.ab-ota u:object_r:exported_pm_prop:s0 exact string

View file

@ -21,6 +21,7 @@ allow radio net_data_file:file r_file_perms;
set_prop(radio, radio_prop)
set_prop(radio, exported_radio_prop)
set_prop(radio, exported2_radio_prop)
set_prop(radio, exported3_radio_prop)
set_prop(radio, net_radio_prop)
# ctl interface

View file

@ -172,6 +172,7 @@ set_prop(vendor_init, exported2_config_prop)
set_prop(vendor_init, exported2_system_prop)
set_prop(vendor_init, exported2_vold_prop)
set_prop(vendor_init, exported3_default_prop)
set_prop(vendor_init, exported3_radio_prop)
set_prop(vendor_init, logd_prop)
set_prop(vendor_init, log_tag_prop)
set_prop(vendor_init, log_prop)