| commit | 682ae37f62f9c4cb399295885e1822f65f4ed9f6 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Sat Apr 16 22:47:26 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 16 22:47:26 2022 +0000 |
| tree | ba661fd4edad927d524c231855a50bfa0c71ac76 | |
| parent | c4150d6a256994376c2243260c76e24c64929470 [diff] | |
| parent | 290faa49500fc8e1949d046177fffda2dc5db08e [diff] |
Merge "CCodec: Do not crash when there is no OMX service" into tm-dev am: 290faa4950 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/17776491 Change-Id: I9c675cc9ff4fc2a8b755b210f4ae96e64d136464 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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::