commit 6c0aac159b39e54feef5027c99c018f58949574d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 04 09:45:56 2024 +0000
committer Copybara-Service <copybara-worker@google.com> Tue Mar 05 21:12:58 2024 -0800
tree 4b5aeb78458cc358cf251d0d029146ea5a4c51ac
parent 548f3f083395f2b1f3b061dbf5995873f1eb13f9

Merge "Try not to crash when gl interop fails" into main am: 388ecd5f4f

Original change: https://android-review.googlesource.com/c/platform/hardware/google/gfxstream/+/2984052

Change-Id: Ia54910fb79a152bf6495c4ceec0009862bc57d17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GitOrigin-RevId: 354fba5714077e9e476f784d7d55815b31c0e660

host/ColorBuffer.cpp

diff --git a/host/ColorBuffer.cpp b/host/ColorBuffer.cpp
index 3cdecbf..2a9bcd1 100644
--- a/host/ColorBuffer.cpp
+++ b/host/ColorBuffer.cpp
@@ -99,7 +99,6 @@
                 colorBuffer->mGlAndVkAreSharingExternalMemory = true;
             } else {
                 ERR("Failed to import memory to ColorBufferGl:%d", handle);
-                return nullptr;
             }
         }
     }