commit d1347913f109865df620af3ab8ea76f5439ea357
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 02 03:06:03 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 02 03:06:03 2022 +0000
tree 8aefbda986fb52871e0fc7466fd9149627a695f0
parent 3fc5f4b76576f9c0c35933b3d5f832ba08f3507b
parent 5838e98c61b0d6cfd4f8825d36ab753d70ee4c25

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

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

Change-Id: I81da86d18bf68b9656d2ab950b28bba981b6dad7

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();
 }