commit 290faa49500fc8e1949d046177fffda2dc5db08e
author Sungtak Lee <taklee@google.com> Sat Apr 16 22:28:52 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 16 22:28:52 2022 +0000
tree ba661fd4edad927d524c231855a50bfa0c71ac76
parent be55f49361dde8374b079ee9597a2d32d8df1844
parent 47dcb48b5a355bdfe43b9e1dfb7487c7a08abb3d

Merge "CCodec: Do not crash when there is no OMX service" into tm-dev

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 3302dd3..cb362c9 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -1526,6 +1526,9 @@
     using namespace android::hardware::graphics::bufferqueue::V1_0::utils;
     typedef android::hardware::media::omx::V1_0::Status OmxStatus;
     android::sp<IOmx> omx = IOmx::getService();
+    if (omx == nullptr) {
+        return nullptr;
+    }
     typedef android::hardware::graphics::bufferqueue::V1_0::
             IGraphicBufferProducer HGraphicBufferProducer;
     typedef android::hardware::media::omx::V1_0::