Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc90eea authored by Ady Abraham's avatar Ady Abraham
Browse files

Reorganize surfaceflinger_flags aconfig 

- Freeze the old flag file
- Create a new file, alphabetize and annotate
  brackets to reduce merge conflicts

Test: presubmit
Change-Id: I6b6a1c81dea39f22eca5dc671e0cfedc7d139b25
parent b6c7f880

services/surfaceflinger/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -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 {

services/surfaceflinger/surfaceflinger_flags.aconfig

+18 −0
Original line number Diff line number Diff line 
# 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

services/surfaceflinger/surfaceflinger_flags_new.aconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
# 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