Merge "Fix TODOs of duplicate property names for prefix and exact matching"
This commit is contained in:
commit
1757417211
6 changed files with 7 additions and 8 deletions
|
@ -15,6 +15,7 @@
|
|||
exported_default_prop
|
||||
exported_dumpstate_prop
|
||||
exported_ffs_prop
|
||||
exported_fingerprint_prop
|
||||
exported_overlay_prop
|
||||
exported_pm_prop
|
||||
exported_radio_prop
|
||||
|
|
|
@ -9,10 +9,7 @@ net.qmi u:object_r:net_radio_prop:s0
|
|||
net.lte u:object_r:net_radio_prop:s0
|
||||
net.cdma u:object_r:net_radio_prop:s0
|
||||
net.dns u:object_r:net_dns_prop:s0
|
||||
# TODO(b/36001741): Rename to sys.usb.config when exact match is supported and
|
||||
# so an exact-matching spec isn't considered as a duplicate of a
|
||||
# prefix-matching spec having the same property name.
|
||||
sys.usb.conf u:object_r:system_radio_prop:s0
|
||||
sys.usb.config u:object_r:system_radio_prop:s0
|
||||
ril. u:object_r:radio_prop:s0
|
||||
ro.ril. u:object_r:radio_prop:s0
|
||||
gsm. u:object_r:radio_prop:s0
|
||||
|
@ -90,9 +87,6 @@ ro.crypto. u:object_r:vold_prop:s0
|
|||
|
||||
# ro.build.fingerprint is either set in /system/build.prop, or is
|
||||
# set at runtime by system_server.
|
||||
# TODO(b/36001741): Copy into exported_property_contexts when exact match is
|
||||
# supported and so an exact-matching spec isn't considered as a duplicate of a
|
||||
# prefix-matching spec having the same property name.
|
||||
ro.build.fingerprint u:object_r:fingerprint_prop:s0
|
||||
|
||||
ro.persistent_properties.ready u:object_r:persistent_properties_ready_prop:s0
|
||||
|
|
|
@ -480,6 +480,7 @@ set_prop(system_server, exported_system_radio_prop)
|
|||
set_prop(system_server, debug_prop)
|
||||
set_prop(system_server, powerctl_prop)
|
||||
set_prop(system_server, fingerprint_prop)
|
||||
set_prop(system_server, exported_fingerprint_prop)
|
||||
set_prop(system_server, device_logging_prop)
|
||||
set_prop(system_server, dumpstate_options_prop)
|
||||
set_prop(system_server, overlay_prop)
|
||||
|
|
|
@ -129,11 +129,11 @@ get_prop(domain, debug_prop)
|
|||
get_prop(domain, exported_config_prop)
|
||||
get_prop(domain, exported_default_prop)
|
||||
get_prop(domain, exported_dumpstate_prop)
|
||||
get_prop(domain, exported_fingerprint_prop)
|
||||
get_prop(domain, exported_radio_prop)
|
||||
get_prop(domain, exported_system_prop)
|
||||
get_prop(domain, exported_vold_prop)
|
||||
get_prop(domain, exported2_default_prop)
|
||||
get_prop(domain, fingerprint_prop)
|
||||
get_prop(domain, logd_prop)
|
||||
|
||||
# Let everyone read log properties, so that liblog can avoid sending unloggable
|
||||
|
|
|
@ -59,6 +59,7 @@ type exported_dalvik_prop, property_type;
|
|||
type exported_default_prop, property_type;
|
||||
type exported_dumpstate_prop, property_type;
|
||||
type exported_ffs_prop, property_type;
|
||||
type exported_fingerprint_prop, property_type;
|
||||
type exported_overlay_prop, property_type;
|
||||
type exported_pm_prop, property_type;
|
||||
type exported_radio_prop, property_type;
|
||||
|
@ -127,6 +128,7 @@ compatible_property_only(`
|
|||
exported_default_prop
|
||||
exported_dumpstate_prop
|
||||
exported_ffs_prop
|
||||
exported_fingerprint_prop
|
||||
exported_radio_prop
|
||||
exported_system_prop
|
||||
exported_system_radio_prop
|
||||
|
|
|
@ -158,6 +158,7 @@ ro.build.date u:object_r:exported2_default_prop:s0 exact string
|
|||
ro.build.date.utc u:object_r:exported2_default_prop:s0 exact int
|
||||
ro.build.description u:object_r:exported2_default_prop:s0 exact string
|
||||
ro.build.display.id u:object_r:exported2_default_prop:s0 exact string
|
||||
ro.build.fingerprint u:object_r:exported_fingerprint_prop:s0 exact string
|
||||
ro.build.host u:object_r:exported2_default_prop:s0 exact string
|
||||
ro.build.id u:object_r:exported2_default_prop:s0 exact string
|
||||
ro.build.product u:object_r:exported2_default_prop:s0 exact string
|
||||
|
|
Loading…
Reference in a new issue