commit e4c853331e167836f8f04f2d84c01926c788127d
author Alec Mouri <alecmouri@google.com> Wed Nov 27 21:12:51 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 27 21:12:51 2024 +0000
tree 2e7997128e7d7a3c5cba4ec66cf8498553769993
parent 43a2bd1ae920f4577997a0b94304b0c11129a99e
parent 27c2a2da65b440f63bcbbc0389e49ae0c9d59af3

Reorder RengineEngine and LayerSettings in VTS am: 27c2a2da65

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

Change-Id: I86ba4b7a0f1dbb4b568ffd31ff1733f613d07a9f
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 bbe508f..6553720 100644
--- a/graphics/composer/aidl/vts/RenderEngineVts.h
+++ b/graphics/composer/aidl/vts/RenderEngineVts.h
@@ -51,9 +51,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;