commit 70ddc67cbc26297a9ea6a5b870bb851f0ff06c1c
author Lloyd Pique <lpique@google.com> Tue Apr 30 18:20:40 2024 -0700
committer Lloyd Pique <lpique@google.com> Wed May 01 16:42:46 2024 -0700
tree 8d3f1c6e45b1cdc6e13064587f4cd20df85c0f5f
parent d50d517fb36c05ee2a877a3684fb1d3ff6e273c2

SF: Pass owning Layer when creating LayerFE

This is a quick patch for ARC so that the LayerFE's know what Layer they
correspond to. A recently reverted change to remove
legacyFrontEndEnabled broke ARC targets as the new code created
LayerFE's that didn't know the corresponding Layer, and caused other
startup failures as a result.

Bug: 337894453
Test: Play Store is usable on Chromebooks
Test: atest libsurfaceflinger_unittest

Change-Id: I0d83153236d99d65d850b1fb3fdd8d1cf461b50d

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index df226c9..6730ab0 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -9337,7 +9337,7 @@
                                                     "Couldnt find layer object for %s",
                                                     snapshot->getDebugString().c_str());
                     Layer* legacyLayer = (it == mLegacyLayers.end()) ? nullptr : it->second.get();
-                    sp<LayerFE> layerFE = getFactory().createLayerFE(snapshot->name);
+                    sp<LayerFE> layerFE = getFactory().createLayerFE(snapshot->name, legacyLayer);
                     layerFE->mSnapshot = std::make_unique<frontend::LayerSnapshot>(*snapshot);
                     layers.emplace_back(legacyLayer, std::move(layerFE));
                 });