commit 1cf68fcb91b74172f29eb80bd62ed0c90dc29758
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 14 00:48:57 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 14 00:48:57 2024 +0000
tree db44afc546ca393169457570717fc1780f204be6
parent 2bbcc63d08fb3b4ef5b5abe43038f71856410d6d
parent 35672ce509d3257a3d45982ad11c3d78dd007814

Merge "C2BqBuffer: fix to check consumer usage when migrating during surface change" into main am: 35672ce509

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3343540

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

media/codec2/vndk/platform/C2BqBuffer.cpp

diff --git a/media/codec2/vndk/platform/C2BqBuffer.cpp b/media/codec2/vndk/platform/C2BqBuffer.cpp
index 665f9fc..17dfe9c 100644
--- a/media/codec2/vndk/platform/C2BqBuffer.cpp
+++ b/media/codec2/vndk/platform/C2BqBuffer.cpp
@@ -997,7 +997,7 @@
         return -1;
     }
 
-    if (toUsage != graphicBuffer->getUsage()) {
+    if ((toUsage & graphicBuffer->getUsage()) != toUsage) {
         sp<GraphicBuffer> newBuffer = new GraphicBuffer(
             graphicBuffer->handle, GraphicBuffer::CLONE_HANDLE,
             graphicBuffer->width, graphicBuffer->height, graphicBuffer->format,