summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerry Chang <chenghsiuchang@google.com> 2023-10-20 03:17:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-10-20 03:17:05 +0000
commit3feea1b9aadf0777d1a2db15aa9b777a7b19d1b8 (patch)
treea435694b6ce1950fe245f54c924ff4651368e11b
parent6d90487585191b2160fa6afa03b326b67534ce8d (diff)
parentdac89e904f6557d60b2645ad7f17c038cd9692ac (diff)
Merge "Rename small dirty detection flag" into main
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp2
-rw-r--r--services/surfaceflinger/surfaceflinger_flags.aconfig16
2 files changed, 9 insertions, 9 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index c2e704ce6f..bc6d375bb6 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4033,7 +4033,7 @@ void SurfaceFlinger::initScheduler(const sp<const DisplayDevice>& display) {
if (sysprop::use_content_detection_for_refresh_rate(false)) {
features |= Feature::kContentDetection;
- if (flags::vrr_small_dirty_detection()) {
+ if (flags::enable_small_area_detection()) {
features |= Feature::kSmallDirtyContentDetection;
}
}
diff --git a/services/surfaceflinger/surfaceflinger_flags.aconfig b/services/surfaceflinger/surfaceflinger_flags.aconfig
index 5a277bdc89..19d194f5b7 100644
--- a/services/surfaceflinger/surfaceflinger_flags.aconfig
+++ b/services/surfaceflinger/surfaceflinger_flags.aconfig
@@ -32,14 +32,6 @@ flag {
}
flag {
- name: "vrr_small_dirty_detection"
- namespace: "core_graphics"
- description: "Controls small dirty detection for VRR"
- bug: "283055450"
- is_fixed_read_only: true
-}
-
-flag {
name: "dont_skip_on_early"
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"
@@ -53,3 +45,11 @@ flag {
bug: "259132483"
is_fixed_read_only: true
}
+
+flag {
+ name: "enable_small_area_detection"
+ namespace: "core_graphics"
+ description: "Feature flag for SmallAreaDetection"
+ bug: "283055450"
+ is_fixed_read_only: true
+} \ No newline at end of file