resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp (6df83350) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/sysprop/SurfaceFlingerProperties.sysprop

+27 −27

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ owner: Platform
		prop {
		api_name: "vsync_event_phase_offset_ns"
		type: Long
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.vsync_event_phase_offset_ns"
		}
		@@ -44,7 +44,7 @@ prop {
		prop {
		api_name: "vsync_sf_event_phase_offset_ns"
		type: Long
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.vsync_sf_event_phase_offset_ns"
		}
		@@ -53,7 +53,7 @@ prop {
		prop {
		api_name: "use_context_priority"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.use_context_priority"
		}
		@@ -62,7 +62,7 @@ prop {
		prop {
		api_name: "max_frame_buffer_acquired_buffers"
		type: Long
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.max_frame_buffer_acquired_buffers"
		}
		@@ -80,7 +80,7 @@ prop {
		prop {
		api_name: "has_wide_color_display"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.has_wide_color_display"
		}
		@@ -90,7 +90,7 @@ prop {
		prop {
		api_name: "running_without_sync_framework"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.running_without_sync_framework"
		}
		@@ -108,7 +108,7 @@ prop {
		prop {
		api_name: "has_HDR_display"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.has_HDR_display"
		}
		@@ -117,7 +117,7 @@ prop {
		prop {
		api_name: "present_time_offset_from_vsync_ns"
		type: Long
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.present_time_offset_from_vsync_ns"
		}
		@@ -129,7 +129,7 @@ prop {
		prop {
		api_name: "force_hwc_copy_for_virtual_displays"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.force_hwc_copy_for_virtual_displays"
		}
		@@ -139,7 +139,7 @@ prop {
		prop {
		api_name: "max_virtual_display_dimension"
		type: Long
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.max_virtual_display_dimension"
		}
		@@ -151,7 +151,7 @@ prop {
		prop {
		api_name: "use_vr_flinger"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.use_vr_flinger"
		}
		@@ -161,7 +161,7 @@ prop {
		prop {
		api_name: "start_graphics_allocator_service"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.start_graphics_allocator_service"
		}
		@@ -171,7 +171,7 @@ prop {
		api_name: "primary_display_orientation"
		type: Enum
		enum_values: "ORIENTATION_0\|ORIENTATION_90\|ORIENTATION_180\|ORIENTATION_270"
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.primary_display_orientation"
		}
		@@ -182,7 +182,7 @@ prop {
		prop {
		api_name: "use_color_management"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.use_color_management"
		}
		@@ -209,7 +209,7 @@ prop {
		prop {
		api_name: "default_composition_dataspace"
		type: Long
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.default_composition_dataspace"
		}
		@@ -220,7 +220,7 @@ prop {
		prop {
		api_name: "default_composition_pixel_format"
		type: Integer
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.default_composition_pixel_format"
		}
		@@ -235,7 +235,7 @@ prop {
		prop {
		api_name: "wcg_composition_dataspace"
		type: Long
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.wcg_composition_dataspace"
		}
		@@ -246,7 +246,7 @@ prop {
		prop {
		api_name: "wcg_composition_pixel_format"
		type: Integer
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.wcg_composition_pixel_format"
		}
		@@ -272,7 +272,7 @@ prop {
		prop {
		api_name: "display_primary_red"
		type: DoubleList
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.display_primary_red"
		}
		@@ -280,7 +280,7 @@ prop {
		prop {
		api_name: "display_primary_green"
		type: DoubleList
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.display_primary_green"
		}
		@@ -288,7 +288,7 @@ prop {
		prop {
		api_name: "display_primary_blue"
		type: DoubleList
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.display_primary_blue"
		}
		@@ -296,7 +296,7 @@ prop {
		prop {
		api_name: "display_primary_white"
		type: DoubleList
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.display_primary_white"
		}
		@@ -307,7 +307,7 @@ prop {
		prop {
		api_name: "set_idle_timer_ms"
		type: Integer
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.set_idle_timer_ms"
		}
		@@ -318,7 +318,7 @@ prop {
		prop {
		api_name: "set_touch_timer_ms"
		type: Integer
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.set_touch_timer_ms"
		}
		@@ -340,7 +340,7 @@ prop {
		prop {
		api_name: "use_smart_90_for_video"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.use_smart_90_for_video"
		}
		@@ -348,7 +348,7 @@ prop {
		prop {
		api_name: "enable_protected_contents"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.protected_contents"
		}
		@@ -358,7 +358,7 @@ prop {
		prop {
		api_name: "support_kernel_idle_timer"
		type: Boolean
		scope: System
		scope: Public
		access: Readonly
		prop_name: "ro.surface_flinger.support_kernel_idle_timer"
		}

services/surfaceflinger/sysprop/api/SurfaceFlingerProperties-current.txt

0 → 100644

+138 −0

Original line number	Diff line number	Diff line
		props {
		module: "android.sysprop.SurfaceFlingerProperties"
		prop {
		api_name: "color_space_agnostic_dataspace"
		type: Long
		prop_name: "ro.surface_flinger.color_space_agnostic_dataspace"
		}
		prop {
		api_name: "default_composition_dataspace"
		type: Long
		prop_name: "ro.surface_flinger.default_composition_dataspace"
		}
		prop {
		api_name: "default_composition_pixel_format"
		type: Integer
		prop_name: "ro.surface_flinger.default_composition_pixel_format"
		}
		prop {
		api_name: "display_primary_blue"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_blue"
		}
		prop {
		api_name: "display_primary_green"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_green"
		}
		prop {
		api_name: "display_primary_red"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_red"
		}
		prop {
		api_name: "display_primary_white"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_white"
		}
		prop {
		api_name: "enable_protected_contents"
		prop_name: "ro.surface_flinger.protected_contents"
		}
		prop {
		api_name: "force_hwc_copy_for_virtual_displays"
		prop_name: "ro.surface_flinger.force_hwc_copy_for_virtual_displays"
		}
		prop {
		api_name: "has_HDR_display"
		prop_name: "ro.surface_flinger.has_HDR_display"
		}
		prop {
		api_name: "has_wide_color_display"
		prop_name: "ro.surface_flinger.has_wide_color_display"
		}
		prop {
		api_name: "max_frame_buffer_acquired_buffers"
		type: Long
		prop_name: "ro.surface_flinger.max_frame_buffer_acquired_buffers"
		}
		prop {
		api_name: "max_virtual_display_dimension"
		type: Long
		prop_name: "ro.surface_flinger.max_virtual_display_dimension"
		}
		prop {
		api_name: "present_time_offset_from_vsync_ns"
		type: Long
		prop_name: "ro.surface_flinger.present_time_offset_from_vsync_ns"
		}
		prop {
		api_name: "primary_display_orientation"
		type: Enum
		prop_name: "ro.surface_flinger.primary_display_orientation"
		enum_values: "ORIENTATION_0\|ORIENTATION_90\|ORIENTATION_180\|ORIENTATION_270"
		}
		prop {
		api_name: "running_without_sync_framework"
		prop_name: "ro.surface_flinger.running_without_sync_framework"
		}
		prop {
		api_name: "set_display_power_timer_ms"
		type: Integer
		prop_name: "ro.surface_flinger.set_display_power_timer_ms"
		}
		prop {
		api_name: "set_idle_timer_ms"
		type: Integer
		prop_name: "ro.surface_flinger.set_idle_timer_ms"
		}
		prop {
		api_name: "set_touch_timer_ms"
		type: Integer
		prop_name: "ro.surface_flinger.set_touch_timer_ms"
		}
		prop {
		api_name: "start_graphics_allocator_service"
		prop_name: "ro.surface_flinger.start_graphics_allocator_service"
		}
		prop {
		api_name: "support_kernel_idle_timer"
		prop_name: "ro.surface_flinger.support_kernel_idle_timer"
		}
		prop {
		api_name: "use_color_management"
		prop_name: "ro.surface_flinger.use_color_management"
		}
		prop {
		api_name: "use_context_priority"
		prop_name: "ro.surface_flinger.use_context_priority"
		}
		prop {
		api_name: "use_smart_90_for_video"
		prop_name: "ro.surface_flinger.use_smart_90_for_video"
		}
		prop {
		api_name: "use_vr_flinger"
		prop_name: "ro.surface_flinger.use_vr_flinger"
		}
		prop {
		api_name: "vsync_event_phase_offset_ns"
		type: Long
		prop_name: "ro.surface_flinger.vsync_event_phase_offset_ns"
		}
		prop {
		api_name: "vsync_sf_event_phase_offset_ns"
		type: Long
		prop_name: "ro.surface_flinger.vsync_sf_event_phase_offset_ns"
		}
		prop {
		api_name: "wcg_composition_dataspace"
		type: Long
		prop_name: "ro.surface_flinger.wcg_composition_dataspace"
		}
		prop {
		api_name: "wcg_composition_pixel_format"
		type: Integer
		prop_name: "ro.surface_flinger.wcg_composition_pixel_format"
		}
		}

services/surfaceflinger/sysprop/api/SurfaceFlingerProperties-latest.txt

0 → 100644

+138 −0

Original line number	Diff line number	Diff line
		props {
		module: "android.sysprop.SurfaceFlingerProperties"
		prop {
		api_name: "color_space_agnostic_dataspace"
		type: Long
		prop_name: "ro.surface_flinger.color_space_agnostic_dataspace"
		}
		prop {
		api_name: "default_composition_dataspace"
		type: Long
		prop_name: "ro.surface_flinger.default_composition_dataspace"
		}
		prop {
		api_name: "default_composition_pixel_format"
		type: Integer
		prop_name: "ro.surface_flinger.default_composition_pixel_format"
		}
		prop {
		api_name: "display_primary_blue"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_blue"
		}
		prop {
		api_name: "display_primary_green"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_green"
		}
		prop {
		api_name: "display_primary_red"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_red"
		}
		prop {
		api_name: "display_primary_white"
		type: DoubleList
		prop_name: "ro.surface_flinger.display_primary_white"
		}
		prop {
		api_name: "enable_protected_contents"
		prop_name: "ro.surface_flinger.protected_contents"
		}
		prop {
		api_name: "force_hwc_copy_for_virtual_displays"
		prop_name: "ro.surface_flinger.force_hwc_copy_for_virtual_displays"
		}
		prop {
		api_name: "has_HDR_display"
		prop_name: "ro.surface_flinger.has_HDR_display"
		}
		prop {
		api_name: "has_wide_color_display"
		prop_name: "ro.surface_flinger.has_wide_color_display"
		}
		prop {
		api_name: "max_frame_buffer_acquired_buffers"
		type: Long
		prop_name: "ro.surface_flinger.max_frame_buffer_acquired_buffers"
		}
		prop {
		api_name: "max_virtual_display_dimension"
		type: Long
		prop_name: "ro.surface_flinger.max_virtual_display_dimension"
		}
		prop {
		api_name: "present_time_offset_from_vsync_ns"
		type: Long
		prop_name: "ro.surface_flinger.present_time_offset_from_vsync_ns"
		}
		prop {
		api_name: "primary_display_orientation"
		type: Enum
		prop_name: "ro.surface_flinger.primary_display_orientation"
		enum_values: "ORIENTATION_0\|ORIENTATION_90\|ORIENTATION_180\|ORIENTATION_270"
		}
		prop {
		api_name: "running_without_sync_framework"
		prop_name: "ro.surface_flinger.running_without_sync_framework"
		}
		prop {
		api_name: "set_display_power_timer_ms"
		type: Integer
		prop_name: "ro.surface_flinger.set_display_power_timer_ms"
		}
		prop {
		api_name: "set_idle_timer_ms"
		type: Integer
		prop_name: "ro.surface_flinger.set_idle_timer_ms"
		}
		prop {
		api_name: "set_touch_timer_ms"
		type: Integer
		prop_name: "ro.surface_flinger.set_touch_timer_ms"
		}
		prop {
		api_name: "start_graphics_allocator_service"
		prop_name: "ro.surface_flinger.start_graphics_allocator_service"
		}
		prop {
		api_name: "support_kernel_idle_timer"
		prop_name: "ro.surface_flinger.support_kernel_idle_timer"
		}
		prop {
		api_name: "use_color_management"
		prop_name: "ro.surface_flinger.use_color_management"
		}
		prop {
		api_name: "use_context_priority"
		prop_name: "ro.surface_flinger.use_context_priority"
		}
		prop {
		api_name: "use_smart_90_for_video"
		prop_name: "ro.surface_flinger.use_smart_90_for_video"
		}
		prop {
		api_name: "use_vr_flinger"
		prop_name: "ro.surface_flinger.use_vr_flinger"
		}
		prop {
		api_name: "vsync_event_phase_offset_ns"
		type: Long
		prop_name: "ro.surface_flinger.vsync_event_phase_offset_ns"
		}
		prop {
		api_name: "vsync_sf_event_phase_offset_ns"
		type: Long
		prop_name: "ro.surface_flinger.vsync_sf_event_phase_offset_ns"
		}
		prop {
		api_name: "wcg_composition_dataspace"
		type: Long
		prop_name: "ro.surface_flinger.wcg_composition_dataspace"
		}
		prop {
		api_name: "wcg_composition_pixel_format"
		type: Integer
		prop_name: "ro.surface_flinger.wcg_composition_pixel_format"
		}
		}

services/surfaceflinger/sysprop/api/current.txt

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		// Signature format: 2.0

services/surfaceflinger/sysprop/api/removed.txt

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		// Signature format: 2.0