Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: Ie43761a96540ce489b65d9ba467ebdfa2dfe6066
Merged-In: I87a1ce741a77f5bd3a4ea81f1c519f7c1955a3c6
This commit is contained in:
Xin Li 2019-09-08 13:07:03 -07:00
commit 36edee480d
3 changed files with 5 additions and 0 deletions

View File

@ -283,6 +283,7 @@ allow system_server {
hal_graphics_composer_server
hal_health_server
hal_omx_server
hal_power_stats_server
hal_sensors_server
hal_vr_server
}:process { signal };

View File

@ -393,5 +393,7 @@ ro.surface_flinger.display_primary_white u:object_r:exported_default_prop:s0 exa
ro.surface_flinger.protected_contents u:object_r:exported_default_prop:s0 exact bool
ro.surface_flinger.set_idle_timer_ms u:object_r:exported_default_prop:s0 exact int
ro.surface_flinger.set_touch_timer_ms u:object_r:exported_default_prop:s0 exact int
ro.surface_flinger.set_display_power_timer_ms u:object_r:exported_default_prop:s0 exact int
ro.surface_flinger.support_kernel_idle_timer u:object_r:exported_default_prop:s0 exact bool
ro.surface_flinger.use_smart_90_for_video u:object_r:exported_default_prop:s0 exact bool
ro.surface_flinger.color_space_agnostic_dataspace u:object_r:exported_default_prop:s0 exact int

View File

@ -400,5 +400,7 @@ ro.surface_flinger.display_primary_white u:object_r:exported_default_prop:s0 exa
ro.surface_flinger.protected_contents u:object_r:exported_default_prop:s0 exact bool
ro.surface_flinger.set_idle_timer_ms u:object_r:exported_default_prop:s0 exact int
ro.surface_flinger.set_touch_timer_ms u:object_r:exported_default_prop:s0 exact int
ro.surface_flinger.set_display_power_timer_ms u:object_r:exported_default_prop:s0 exact int
ro.surface_flinger.support_kernel_idle_timer u:object_r:exported_default_prop:s0 exact bool
ro.surface_flinger.use_smart_90_for_video u:object_r:exported_default_prop:s0 exact bool
ro.surface_flinger.color_space_agnostic_dataspace u:object_r:exported_default_prop:s0 exact int