SF: prioritize auto latch unsignlaled
Do not enable LatchUnsignaledConfig::Always unless
LatchUnsignaledConfig::AutoSingleLayer is explicitly disabled.
Test: manual
Bug: 198190129
Change-Id: I4c49113e1cd6be9e59b1691ef33ad567fe4b15a0
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index de12d62..e3d1d92 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -459,14 +459,14 @@
}
LatchUnsignaledConfig SurfaceFlinger::getLatchUnsignaledConfig() {
- if (base::GetBoolProperty("debug.sf.latch_unsignaled"s, false)) {
- return LatchUnsignaledConfig::Always;
- }
-
if (base::GetBoolProperty("debug.sf.auto_latch_unsignaled"s, true)) {
return LatchUnsignaledConfig::AutoSingleLayer;
}
+ if (base::GetBoolProperty("debug.sf.latch_unsignaled"s, false)) {
+ return LatchUnsignaledConfig::Always;
+ }
+
return LatchUnsignaledConfig::Disabled;
}