commit 2ec1401babfa0c1ee8d4f2c3d8278ed11c21bd36
author Alec Mouri <alecmouri@google.com> Wed Jan 22 14:45:52 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 22 14:45:52 2025 -0800
tree 46e30c1839a242f364c048ed4c0d68fca8557900
parent 65a56d4a2ab063ffed4a9f017bb804c25f240992
parent 14b0180f75939f79d7f8554e93843843d94c0665

Reorder RengineEngine and LayerSettings in VTS am: 3a08641913 am: 2ddea90318 am: 14b0180f75

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3461979

Change-Id: Ib48b9d8a6e0b7790e95e2e1844e9cebfad28f8f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

graphics/composer/aidl/vts/RenderEngineVts.h

diff --git a/graphics/composer/aidl/vts/RenderEngineVts.h b/graphics/composer/aidl/vts/RenderEngineVts.h
index 43d3a42..b6ad3b6 100644
--- a/graphics/composer/aidl/vts/RenderEngineVts.h
+++ b/graphics/composer/aidl/vts/RenderEngineVts.h
@@ -53,9 +53,10 @@
 
   private:
     common::PixelFormat mFormat;
-    std::vector<::android::renderengine::LayerSettings> mCompositionLayers;
     std::unique_ptr<::android::renderengine::RenderEngine> mRenderEngine;
-    std::vector<::android::renderengine::LayerSettings> mRenderLayers;
+    // Delete RenderEngine layers before RenderEngine -- ExternalTexture holds a reference to
+    // RenderEngine.
+    std::vector<::android::renderengine::LayerSettings> mCompositionLayers;
     ::android::sp<::android::GraphicBuffer> mGraphicBuffer;
 
     DisplaySettings mDisplaySettings;