commit d4cf9f2e0c29a7f19678cf42031bc7eb2e5d2371
author Ady Abraham <adyabr@google.com> Wed Aug 10 22:18:33 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 10 22:18:33 2022 +0000
tree 64464ea51a651c97bee55c91621d4fb02b76f6c0
parent f734f6937d6bb03585490a83078d8a20359d4786
parent fb67be1809365c69571617128cbee067657b4fbc

Merge "SF: prioritize auto latch unsignlaled"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0adb792..744cb46 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -460,14 +460,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;
 }