resolve merge conflicts of 98412ab60466c148370dd4ee4b83d3bb1e0a069c to rvc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I831c2feb3b86bfa2008ef6e5b74e81399d8145d8
diff --git a/private/compat/29.0/29.0.ignore.cil b/private/compat/29.0/29.0.ignore.cil
index 1d4216c..4a781ce 100644
--- a/private/compat/29.0/29.0.ignore.cil
+++ b/private/compat/29.0/29.0.ignore.cil
@@ -99,6 +99,7 @@
soundtrigger_middleware_service
staged_install_file
storage_config_prop
+ surfaceflinger_display_prop
sysfs_dm_verity
system_adbd_prop
system_config_service
diff --git a/private/property.te b/private/property.te
index 1aa4ddf..c5a4f83 100644
--- a/private/property.te
+++ b/private/property.te
@@ -406,3 +406,12 @@
} {
graphics_config_prop
}:property_service set;
+
+neverallow {
+ -init
+ -vendor_init
+ -system_app
+} {
+ surfaceflinger_display_prop
+}:property_service set;
+
diff --git a/private/property_contexts b/private/property_contexts
index 2489c13..bab2a1a 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -858,3 +858,7 @@
# Graphics related properties
graphics.gpu.profiler.support u:object_r:graphics_config_prop:s0 exact bool
graphics.gpu.profiler.vulkan_layer_apk u:object_r:graphics_config_prop:s0 exact string
+
+# vendor-init-settable
+graphics.display.kernel_idle_timer.enabled u:object_r:surfaceflinger_display_prop:s0 exact bool
+
diff --git a/private/surfaceflinger.te b/private/surfaceflinger.te
index 973350e..a160246 100644
--- a/private/surfaceflinger.te
+++ b/private/surfaceflinger.te
@@ -57,6 +57,9 @@
set_prop(surfaceflinger, exported3_system_prop)
set_prop(surfaceflinger, ctl_bootanim_prop)
+# Get properties
+get_prop(surfaceflinger, surfaceflinger_display_prop)
+
# Use open files supplied by an app.
allow surfaceflinger appdomain:fd use;
allow surfaceflinger { app_data_file privapp_data_file }:file { read write };
diff --git a/private/system_app.te b/private/system_app.te
index e160ff4..18d4a87 100644
--- a/private/system_app.te
+++ b/private/system_app.te
@@ -57,6 +57,8 @@
auditallow system_app usb_prop:property_service set;
# Allow Settings to enable Dynamic System Update
set_prop(system_app, dynamic_system_prop)
+# Allow Settings to config display kernel idle timer
+set_prop(system_app, surfaceflinger_display_prop)
# ctl interface
set_prop(system_app, ctl_default_prop)