Reenable camera allow- and excludelist property labels
Change-Id: I71e19c3a10735e3d999c1acec0aefa35b03cc20c
diff --git a/common/dynamic/property_contexts b/common/dynamic/property_contexts
deleted file mode 100644
index 2547316..0000000
--- a/common/dynamic/property_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-# Aux camera excludelist prop
-#vendor.camera.aux.packageexcludelist u:object_r:exported_default_prop:s0
diff --git a/common/private/property_contexts b/common/private/property_contexts
index 57cb76f..4851742 100644
--- a/common/private/property_contexts
+++ b/common/private/property_contexts
@@ -1,3 +1,8 @@
+# Aux camera
+vendor.camera.aux.packageexcludelist u:object_r:vendor_persist_camera_prop:s0
+vendor.camera.aux.packagelist u:object_r:vendor_persist_camera_prop:s0
+
+# Radio
ro.telephony.use_old_mnc_mcc_format u:object_r:telephony_config_prop:s0
# Recovery update
diff --git a/common/private/system_server.te b/common/private/system_server.te
index 428dbb2..e654e59 100644
--- a/common/private/system_server.te
+++ b/common/private/system_server.te
@@ -6,3 +6,6 @@
hal_client_domain(system_server, hal_lineage_touch)
hal_client_domain(system_server, hal_lineage_trust)
hal_client_domain(system_server, hal_lineage_powershare)
+
+# Let system server find auxiliary camera properties
+get_prop(system_server, vendor_persist_camera_prop)
diff --git a/common/public/property.te b/common/public/property.te
index 106b5db..2b12f28 100644
--- a/common/public/property.te
+++ b/common/public/property.te
@@ -1,2 +1,5 @@
+# Aux camera allow/excludelist prop
+system_vendor_config_prop(vendor_persist_camera_prop)
+
# Recovery update
system_public_prop(recovery_update_prop)
diff --git a/common/vendor/property_contexts b/common/vendor/property_contexts
deleted file mode 100644
index 231c9bc..0000000
--- a/common/vendor/property_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-# Aux camera allowlist prop
-#vendor.camera.aux.packagelist u:object_r:exported_default_prop:s0