commit 35672ce509d3257a3d45982ad11c3d78dd007814
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 14 00:18:28 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 14 00:18:28 2024 +0000
tree 9153ded71efe0479a409bc8c1f6883744e15da9c
parent 6e662f3062eb3a41dee13bc4d4979e14cc52cf41
parent 8a007370c558fb45ebfa5f31a5c636901b0ae548

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

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,