From f9d27887eb50aa97b1c356aa63ae90a54daf4639 Mon Sep 17 00:00:00 2001
From: Jaekyun Seok <jaekyun@google.com>
Date: Fri, 12 Jan 2018 10:19:48 +0900
Subject: [PATCH] Fix TODOs of duplicate property names for prefix and exact
matching
Duplicate property names are supported now for prefix and exact
matching.
Bug: 38146102
Test: tested on walleye with PRODUCT_COMPATIBLE_PROPERTY=true
Change-Id: Ifd9d32eaece7370d69f121e88d5541f7a2e34458
---
private/compat/26.0/26.0.ignore.cil | 1 +
private/property_contexts | 8 +-------
private/system_server.te | 1 +
public/domain.te | 2 +-
public/property.te | 2 ++
public/property_contexts | 1 +
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index ca7f1fa41..34db6fa14 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -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
diff --git a/private/property_contexts b/private/property_contexts
index de9fce189..bf95b02bc 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -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
diff --git a/private/system_server.te b/private/system_server.te
index f64560803..92988b488 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -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)
diff --git a/public/domain.te b/public/domain.te
index 2222b88e2..d458510cb 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -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
diff --git a/public/property.te b/public/property.te
index bfb7f765f..0578ed61c 100644
--- a/public/property.te
+++ b/public/property.te
@@ -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
diff --git a/public/property_contexts b/public/property_contexts
index b63eec189..e5772e5a6 100644
--- a/public/property_contexts
+++ b/public/property_contexts
@@ -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
--
GitLab