summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoen Chen <joenchen@google.com>2022-11-16 09:01:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-11-16 09:01:32 +0000
commit33f38db80f0b220a2efd17f240684b8d19e54216 (patch)
tree6e846d5a43d9329eeaf3f9276967877028852be2
parentbd36256badf8e1fe2ab1990653291b4e91b89740 (diff)
parentc76556752479a59b7ba006d45792e9ff152e7292 (diff)
Merge changes from topic "RRS_R4" into tm-qpr-dev
* changes: Allow InputProcessor HAL to read display resolution RRS: Apply the default config from persist prop
-rw-r--r--display/gs101/hal_graphics_composer_default.te4
-rw-r--r--whitechapel/vendor/google/hal_input_processor_default.te2
-rw-r--r--whitechapel/vendor/google/property_contexts1
-rw-r--r--whitechapel/vendor/google/vendor_init.te3
4 files changed, 8 insertions, 2 deletions
diff --git a/display/gs101/hal_graphics_composer_default.te b/display/gs101/hal_graphics_composer_default.te
index c1eac9ce..dccddf0e 100644
--- a/display/gs101/hal_graphics_composer_default.te
+++ b/display/gs101/hal_graphics_composer_default.te
@@ -25,8 +25,8 @@ allow hal_graphics_composer_default sysfs_leds:file rw_file_perms;
# allow HWC to get vendor_persist_sys_default_prop
get_prop(hal_graphics_composer_default, vendor_persist_sys_default_prop)
-# allow HWC to get vendor_display_prop
-get_prop(hal_graphics_composer_default, vendor_display_prop)
+# allow HWC to get/set vendor_display_prop
+set_prop(hal_graphics_composer_default, vendor_display_prop)
# allow HWC to get device_config_surface_flinger_native_boot_prop for adpf flags
get_prop(hal_graphics_composer_default, device_config_surface_flinger_native_boot_prop)
diff --git a/whitechapel/vendor/google/hal_input_processor_default.te b/whitechapel/vendor/google/hal_input_processor_default.te
new file mode 100644
index 00000000..00d4c695
--- /dev/null
+++ b/whitechapel/vendor/google/hal_input_processor_default.te
@@ -0,0 +1,2 @@
+# allow InputProcessor HAL to read the display resolution system property
+get_prop(hal_input_processor_default, vendor_display_prop)
diff --git a/whitechapel/vendor/google/property_contexts b/whitechapel/vendor/google/property_contexts
index 29e35d96..eabb6f69 100644
--- a/whitechapel/vendor/google/property_contexts
+++ b/whitechapel/vendor/google/property_contexts
@@ -67,6 +67,7 @@ vendor.audiodump.cca.config u:object_r:vendor_audio_prop:s0
# for display
ro.vendor.hwc.drm.device u:object_r:vendor_display_prop:s0
+persist.vendor.display. u:object_r:vendor_display_prop:s0
# for camera
persist.vendor.camera. u:object_r:vendor_camera_prop:s0
diff --git a/whitechapel/vendor/google/vendor_init.te b/whitechapel/vendor/google/vendor_init.te
index dfd8e996..9686bccb 100644
--- a/whitechapel/vendor/google/vendor_init.te
+++ b/whitechapel/vendor/google/vendor_init.te
@@ -35,3 +35,6 @@ set_prop(vendor_init, vendor_battery_defender_prop)
# Fingerprint property
set_prop(vendor_init, vendor_fingerprint_prop)
+
+# Display
+set_prop(vendor_init, vendor_display_prop)