commit 847eaf44dd735b9c1c3c7648add3665bd639bd9a
author Pawin Vongmasa <pawin@google.com> Wed Aug 14 10:28:29 2019 -0700
committer Pawin Vongmasa <pawin@google.com> Wed Aug 14 20:03:07 2019 +0000
tree e7098adb22159594a00c6e210acd3921574f2199
parent 9c6f37fa98ae4b62949149686bde43319dbbca6f

Add option to remove OMX components from IOmxStore

Test: vts-tradefed run vts -m VtsHalMediaOmxStoreV1_0Host

Bug: 139111743
Change-Id: Ica1e1619f53615f5e2363f7e7aec1831649631e2

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) {