commit 90f56b7ac7052d59a9aa9353457309c2d93e3f38
author Pawin Vongmasa <pawin@google.com> Fri Aug 16 14:49:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 16 14:49:16 2019 -0700
tree 4122c6cfb7a66379b7370e3ab1165be89a8167ef
parent 5f55524296edd32a00e848febff99b2849cef015
parent 847eaf44dd735b9c1c3c7648add3665bd639bd9a

Add option to remove OMX components from IOmxStore
am: 847eaf44dd

Change-Id: I4e89d3dc810ab9077abb043ef3a3c3771ede0a27

services/mediacodec/main_codecservice.cpp

diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index f668c33..6a82b1b 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -21,6 +21,7 @@
 #include "minijail.h"
 
 #include <binder/ProcessState.h>
+#include <cutils/properties.h>
 #include <hidl/HidlTransportSupport.h>
 #include <media/stagefright/omx/1.0/Omx.h>
 #include <media/stagefright/omx/1.0/OmxStore.h>
@@ -57,7 +58,8 @@
     } else {
         LOG(INFO) << "IOmx HAL service created.";
     }
-    sp<IOmxStore> omxStore = new implementation::OmxStore(omx);
+    sp<IOmxStore> omxStore = new implementation::OmxStore(
+            property_get_int64("vendor.media.omx", 1) ? omx : nullptr);
     if (omxStore == nullptr) {
         LOG(ERROR) << "Cannot create IOmxStore HAL service.";
     } else if (omxStore->registerAsService() != OK) {