Merge "allow system_server to set ro.build.fingerprint" into lmp-mr1-dev
diff --git a/property.te b/property.te
index cfa3ec9..aff073a 100644
--- a/property.te
+++ b/property.te
@@ -3,6 +3,7 @@
type debug_prop, property_type;
type debuggerd_prop, property_type;
type dhcp_prop, property_type;
+type fingerprint_prop, property_type;
type radio_prop, property_type;
type net_radio_prop, property_type;
type system_radio_prop, property_type;
diff --git a/property_contexts b/property_contexts
index f89c432..91ab594 100644
--- a/property_contexts
+++ b/property_contexts
@@ -49,6 +49,10 @@
vold. u:object_r:vold_prop:s0
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
+
# ctl properties
ctl.bootanim u:object_r:ctl_bootanim_prop:s0
ctl.dumpstate u:object_r:ctl_dumpstate_prop:s0
diff --git a/system_server.te b/system_server.te
index 5786c2e..d45d5de 100644
--- a/system_server.te
+++ b/system_server.te
@@ -278,6 +278,7 @@
allow system_server system_radio_prop:property_service set;
allow system_server debug_prop:property_service set;
allow system_server powerctl_prop:property_service set;
+allow system_server fingerprint_prop:property_service set;
# ctl interface
allow system_server ctl_default_prop:property_service set;