common: Use property labels from system/sepolicy

Change-Id: I9f20f45d11c81b3fe3f7b38ee2785852cdf78e04

diff --git a/common/private/property_contexts b/common/private/property_contexts
index e7b895371ef6e788431eea7208927dde933a0137..7a25df0eef33cc30e1c5d566e51792af8a30c38a 100644 (file)
--- a/common/private/property_contexts
+++ b/common/private/property_contexts
@@ -1,31 +1,31 @@
 ### BLUETOOTH
-sys.bluetooth.tty                            u:object_r:vendor_public_bluetooth_prop:s0
+sys.bluetooth.tty                            u:object_r:exported_bluetooth_prop:s0
 
 ### BUILD
-ro.build.PDA                                 u:object_r:vendor_public_build_prop:s0
+ro.build.PDA                                 u:object_r:exported2_default_prop:s0
 
 ### CAMERA
-system.camera.CC.                            u:object_r:vendor_public_camera_prop:s0
-service.camera.                              u:object_r:vendor_public_camera_prop:s0
-sys.cameramode.                              u:object_r:vendor_public_camera_prop:s0
-ro.camera.req.fmq.size                       u:object_r:vendor_public_camera_prop:s0
-ro.camera.res.fmq.size                       u:object_r:vendor_public_camera_prop:s0
+system.camera.CC.                            u:object_r:exported_camera_prop:s0
+service.camera.                              u:object_r:exported_camera_prop:s0
+sys.cameramode.                              u:object_r:exported_camera_prop:s0
+ro.camera.req.fmq.size                       u:object_r:exported_camera_prop:s0
+ro.camera.res.fmq.size                       u:object_r:exported_camera_prop:s0
 
 ### CSC
-ro.csc.                                      u:object_r:vendor_public_csc_prop:s0
+ro.csc.                                      u:object_r:exported_config_prop:s0
 
 ### MDC
-mdc.                                         u:object_r:vendor_public_config_prop:s0
+mdc.                                         u:object_r:exported_config_prop:s0
 
 ### OMC
-persist.sys.omc_support                      u:object_r:vendor_public_omc_prop:s0
-persist.sys.omc_etcpath                      u:object_r:vendor_public_omc_prop:s0
-ro.omc.                                      u:object_r:vendor_public_omc_prop:s0
+persist.sys.omc_support                      u:object_r:exported_config_prop:s0
+persist.sys.omc_etcpath                      u:object_r:exported_config_prop:s0
+ro.omc.                                      u:object_r:exported_config_prop:s0
 
 ### RADIO
-ril.NwNmId                                   u:object_r:vendor_public_radio_prop:s0
-ril.NwNmId2                                  u:object_r:vendor_public_radio_prop:s0
-ro.boot.cpboot                               u:object_r:vendor_public_radio_prop:s0
+ril.NwNmId                                   u:object_r:exported_radio_prop:s0
+ril.NwNmId2                                  u:object_r:exported_radio_prop:s0
+ro.boot.cpboot                               u:object_r:exported_radio_prop:s0
 
 ### RFKILL
 ro.rfkilldisabled                            u:object_r:rfkilldisabled_prop:s0

diff --git a/common/public/property.te b/common/public/property.te
index 090d81ca997705597f0f9b6a9b7718f497799a62..97b850f1c08bb363530de79e33127ebbf618ea3a 100644 (file)
--- a/common/public/property.te
+++ b/common/public/property.te
@@ -1,23 +1,5 @@
-### BLUETOOTH
-type vendor_public_bluetooth_prop, property_type;
-
-### BUILD
-type vendor_public_build_prop, property_type;
-
 ### CAMERA
-type vendor_public_camera_prop, property_type;
-
-### CSC
-type vendor_public_csc_prop, property_type;
-
-### MDC
-type vendor_public_config_prop, property_type;
-
-### OMC
-type vendor_public_omc_prop, property_type;
-
-### RADIO
-type vendor_public_radio_prop, property_type;
+type exported_camera_prop, property_type;
 
 ### RFKILL
 type rfkilldisabled_prop, property_type;