commit 5838e98c61b0d6cfd4f8825d36ab753d70ee4c25
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 02 02:51:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 02 02:51:07 2022 +0000
tree 87d060f31afcf3ab000b4917db40b4344c25eef5
parent 4d22ff37827670eafb72cfa361dac2f7b807906c
parent 20934502e7b17409f89457597714b8bde6e4142e

Merge "[surfacetexture] Add patch to release current EglImage" am: 4334485270 am: 20934502e7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1956042

Change-Id: I514f88249ab87bab77a2d5671f915b6da1632523

libs/nativedisplay/surfacetexture/EGLConsumer.cpp

diff --git a/libs/nativedisplay/surfacetexture/EGLConsumer.cpp b/libs/nativedisplay/surfacetexture/EGLConsumer.cpp
index 6882ea3..0128859 100644
--- a/libs/nativedisplay/surfacetexture/EGLConsumer.cpp
+++ b/libs/nativedisplay/surfacetexture/EGLConsumer.cpp
@@ -593,6 +593,10 @@
 }
 
 void EGLConsumer::onFreeBufferLocked(int slotIndex) {
+    if (mEglSlots[slotIndex].mEglImage != nullptr &&
+        mEglSlots[slotIndex].mEglImage == mCurrentTextureImage) {
+        mCurrentTextureImage.clear();
+    }
     mEglSlots[slotIndex].mEglImage.clear();
 }