From f89847a9cd2fea23b4fb2ffc13db18eefa47cece Mon Sep 17 00:00:00 2001 From: Tom Cherry <tomcherry@google.com> Date: Mon, 11 Jan 2016 13:06:25 -0800 Subject: [PATCH] Remove special case handling of "ro." properties Currently, properties that begin with "ro." are special cased to skip over the "ro." part of the prefix before matching with entries in property_contexts. A change to init is removing this special case and therefore, the "ro." prefixes must be explicitly added to property_contexts. Bug 26425619 Change-Id: I343f139a39abef99924e84e0d27699284f335d63 --- property_contexts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/property_contexts b/property_contexts index b20727727..c1ff6d727 100644 --- a/property_contexts +++ b/property_contexts @@ -11,13 +11,15 @@ net.cdma u:object_r:net_radio_prop:s0 net.dns u:object_r:net_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 persist.radio u:object_r:radio_prop:s0 net. u:object_r:system_prop:s0 dev. u:object_r:system_prop:s0 -runtime. u:object_r:system_prop:s0 +ro.runtime. u:object_r:system_prop:s0 hw. u:object_r:system_prop:s0 +ro.hw. u:object_r:system_prop:s0 sys. u:object_r:system_prop:s0 sys.powerctl u:object_r:powerctl_prop:s0 sys.usb.ffs. u:object_r:ffs_prop:s0 @@ -52,11 +54,11 @@ selinux. u:object_r:security_prop:s0 # data partition encryption properties vold. u:object_r:vold_prop:s0 -crypto. u:object_r:vold_prop:s0 +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. -build.fingerprint u:object_r:fingerprint_prop:s0 +ro.build.fingerprint u:object_r:fingerprint_prop:s0 # ctl properties ctl.bootanim u:object_r:ctl_bootanim_prop:s0 @@ -76,4 +78,6 @@ nfc. u:object_r:nfc_prop:s0 # They are only distinguished here for setting by qemu-props on the # emulator/goldfish. config. u:object_r:config_prop:s0 +ro.config. u:object_r:config_prop:s0 dalvik. u:object_r:dalvik_prop:s0 +ro.dalvik. u:object_r:dalvik_prop:s0 -- GitLab