diff options
| -rw-r--r-- | services/surfaceflinger/Android.bp | 5 | ||||
| -rw-r--r-- | services/surfaceflinger/surfaceflinger_flags.aconfig | 18 | ||||
| -rw-r--r-- | services/surfaceflinger/surfaceflinger_flags_new.aconfig | 13 |
3 files changed, 35 insertions, 1 deletions
diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp index 6a0ea221cc..46252e139f 100644 --- a/services/surfaceflinger/Android.bp +++ b/services/surfaceflinger/Android.bp @@ -12,7 +12,10 @@ aconfig_declarations { name: "surfaceflinger_flags", package: "com.android.graphics.surfaceflinger.flags", container: "system", - srcs: ["surfaceflinger_flags.aconfig"], + srcs: [ + "surfaceflinger_flags.aconfig", + "surfaceflinger_flags_new.aconfig", + ], } cc_aconfig_library { diff --git a/services/surfaceflinger/surfaceflinger_flags.aconfig b/services/surfaceflinger/surfaceflinger_flags.aconfig index c8f4218d32..d98dfcb8ff 100644 --- a/services/surfaceflinger/surfaceflinger_flags.aconfig +++ b/services/surfaceflinger/surfaceflinger_flags.aconfig @@ -1,3 +1,5 @@ +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + package: "com.android.graphics.surfaceflinger.flags" container: "system" @@ -25,6 +27,8 @@ flag { is_fixed_read_only: true } +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + flag { name: "enable_layer_command_batching" namespace: "core_graphics" @@ -49,6 +53,8 @@ flag { is_fixed_read_only: true } +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + flag { name: "hotplug2" namespace: "core_graphics" @@ -73,6 +79,8 @@ flag { is_fixed_read_only: true } +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + flag { name: "refresh_rate_overlay_on_external_display" namespace: "core_graphics" @@ -98,6 +106,8 @@ flag { # is_fixed_read_only: true # } +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + flag { name: "cache_when_source_crop_layer_only_moved" namespace: "core_graphics" @@ -130,6 +140,8 @@ flag { is_fixed_read_only: true } +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + flag { name: "game_default_frame_rate" namespace: "game" @@ -162,6 +174,8 @@ flag { is_fixed_read_only: true } +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + flag { name: "renderable_buffer_usage" namespace: "core_graphics" @@ -184,6 +198,8 @@ flag { } } +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig + flag { name: "dont_skip_on_early_ro" namespace: "core_graphics" @@ -201,3 +217,5 @@ flag { purpose: PURPOSE_BUGFIX } } + +# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig diff --git a/services/surfaceflinger/surfaceflinger_flags_new.aconfig b/services/surfaceflinger/surfaceflinger_flags_new.aconfig new file mode 100644 index 0000000000..5451752d91 --- /dev/null +++ b/services/surfaceflinger/surfaceflinger_flags_new.aconfig @@ -0,0 +1,13 @@ +# IMPORTANT - please keep alphabetize to reduce merge conflicts + +package: "com.android.graphics.surfaceflinger.flags" +container: "system" + +flag { + name: "dont_skip_on_early_ro2" + namespace: "core_graphics" + description: "This flag is guarding the behaviour where SurfaceFlinger is trying to opportunistically present a frame when the configuration change from late to early" + bug: "273702768" +} # dont_skip_on_early_ro2 + +# IMPORTANT - please keep alphabetize to reduce merge conflicts |