commit e4af0956e0a5a0080f21e276f4fccadf95d5fe40
author Vishnu Nair <vishnun@google.com> Mon May 01 09:11:33 2023 -0700
committer Vishnu Nair <vishnun@google.com> Mon May 01 09:27:04 2023 -0700
tree c9a4b30c2a9ed46f16af13dbf98ac77ec05725ca
parent 38a3e0b7e2565a583bc4b0733efc21daebd5c31a

[sf] Fix layer ids for background color layers

Fixes a regression caused by Ie0f93ca956e6d043c9d95d00bc205d242e47c4cc
which created duplicate layer ids.

Also deflakes corner radius tests by tracking eCornerRadiusChanged state
changes correctly.

Test: presubmit w/new fe
Bug: 238781169

Change-Id: I2d5321b5ba77e1074ef039bcd90c78e82c1a0049

services/surfaceflinger/FrontEnd/LayerCreationArgs.cpp

diff --git a/services/surfaceflinger/FrontEnd/LayerCreationArgs.cpp b/services/surfaceflinger/FrontEnd/LayerCreationArgs.cpp
index cfa2b03..97af445 100644
--- a/services/surfaceflinger/FrontEnd/LayerCreationArgs.cpp
+++ b/services/surfaceflinger/FrontEnd/LayerCreationArgs.cpp
@@ -50,7 +50,7 @@
     }
 
     if (internalLayer) {
-        sequence = getInternalLayerId(sInternalSequence++);
+        sequence = id.value_or(getInternalLayerId(sInternalSequence++));
     } else if (id) {
         sequence = *id;
         sSequence = *id + 1;