commit 38e65911a65a51edf2efd5ca63c4e00daac24852
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 11 22:11:17 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 11 22:11:17 2020 +0000
tree a0ca8a4c8ff5d0917b4aa887d61a566a57cb6cd6
parent d6bca9b5880329cb1e32bb8c611175c55a4a166f
parent 0f8d6736a5b19a4336d23a79bfacfab296928e95

Merge "OMX: Hide OMX components if vendor.media.omx is 0" into rvc-dev

media/libstagefright/omx/OMXMaster.cpp

diff --git a/media/libstagefright/omx/OMXMaster.cpp b/media/libstagefright/omx/OMXMaster.cpp
index 8c5ca6e..094b1f5 100644
--- a/media/libstagefright/omx/OMXMaster.cpp
+++ b/media/libstagefright/omx/OMXMaster.cpp
@@ -16,6 +16,7 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "OMXMaster"
+#include <android-base/properties.h>
 #include <utils/Log.h>
 
 #include <media/stagefright/omx/OMXMaster.h>
@@ -67,6 +68,10 @@
 }
 
 void OMXMaster::addPlugin(const char *libname) {
+    if (::android::base::GetIntProperty("vendor.media.omx", int64_t(1)) == 0) {
+        return;
+    }
+
     void *libHandle = android_load_sphal_library(libname, RTLD_NOW);
 
     if (libHandle == NULL) {