Merge "Move camera config props to camera_config_prop" am: 98316f23ab
Change-Id: Id5361ce2d2192eafcfb967cfc07facdcdfd590b7
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 307cac7..ada852d 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -29,6 +29,7 @@
bluetooth_a2dp_offload_prop
bpfloader
bpfloader_exec
+ camera_config_prop
cgroup_bpf
charger_exec
color_display_service
diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil
index c53807f..ba79326 100644
--- a/private/compat/30.0/30.0.cil
+++ b/private/compat/30.0/30.0.cil
@@ -1343,7 +1343,10 @@
( exported2_system_prop
surfaceflinger_color_prop))
(typeattributeset exported2_vold_prop_30_0 (exported2_vold_prop vold_config_prop))
-(typeattributeset exported3_default_prop_30_0 (exported3_default_prop lmkd_config_prop))
+(typeattributeset exported3_default_prop_30_0
+ ( exported3_default_prop
+ camera_config_prop
+ lmkd_config_prop))
(typeattributeset exported3_radio_prop_30_0 (exported3_radio_prop))
(typeattributeset exported3_system_prop_30_0 (exported3_system_prop boot_status_prop))
(typeattributeset exported_audio_prop_30_0 (exported_audio_prop audio_config_prop))
diff --git a/private/coredomain.te b/private/coredomain.te
index de58a33..daaf3aa 100644
--- a/private/coredomain.te
+++ b/private/coredomain.te
@@ -1,6 +1,7 @@
get_prop(coredomain, pm_prop)
get_prop(coredomain, exported_pm_prop)
get_prop(coredomain, lmkd_config_prop)
+get_prop(coredomain, camera_config_prop)
full_treble_only(`
neverallow {
diff --git a/private/property_contexts b/private/property_contexts
index dcf0a68..e3497f7 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -259,8 +259,12 @@
audio.offload.video u:object_r:audio_config_prop:s0 exact bool
audio.offload.min.duration.secs u:object_r:audio_config_prop:s0 exact int
-camera.disable_zsl_mode u:object_r:exported3_default_prop:s0 exact bool
-camera.fifo.disable u:object_r:exported3_default_prop:s0 exact int
+config.disable_cameraservice u:object_r:camera_config_prop:s0 exact bool
+
+camera.disable_zsl_mode u:object_r:camera_config_prop:s0 exact bool
+camera.fifo.disable u:object_r:camera_config_prop:s0 exact bool
+ro.camera.notify_nfc u:object_r:camera_config_prop:s0 exact bool
+ro.camera.enableLazyHal u:object_r:camera_config_prop:s0 exact bool
# Should always_debuggable be bool? It's checked against the string "1".
dalvik.vm.always_debuggable u:object_r:dalvik_config_prop:s0 exact int
@@ -381,9 +385,6 @@
ro.bt.bdaddr_path u:object_r:exported_bluetooth_prop:s0 exact string
-ro.camera.notify_nfc u:object_r:exported3_default_prop:s0 exact int
-ro.camera.enableLazyHal u:object_r:exported3_default_prop:s0 exact bool
-
ro.com.android.dataroaming u:object_r:exported3_default_prop:s0 exact bool
ro.com.android.prov_mobiledata u:object_r:exported3_default_prop:s0 exact bool
@@ -638,8 +639,6 @@
aaudio.mmap_policy u:object_r:exported_default_prop:s0 exact int
aaudio.wakeup_delay_usec u:object_r:exported_default_prop:s0 exact int
-config.disable_cameraservice u:object_r:exported_camera_prop:s0 exact bool
-
gsm.sim.operator.numeric u:object_r:exported_radio_prop:s0 exact string
media.mediadrmservice.enable u:object_r:exported_default_prop:s0 exact bool
diff --git a/public/property.te b/public/property.te
index 90d1961..a3b27d8 100644
--- a/public/property.te
+++ b/public/property.te
@@ -101,6 +101,7 @@
# Properties which can be written only by vendor_init
system_vendor_config_prop(apk_verity_prop)
system_vendor_config_prop(audio_config_prop)
+system_vendor_config_prop(camera_config_prop)
system_vendor_config_prop(cpu_variant_prop)
system_vendor_config_prop(dalvik_config_prop)
system_vendor_config_prop(exported_camera_prop)