commit b05dfdff9f1837eb5216aabaa8aaf03d012468bd
author Pawin Vongmasa <pawin@google.com> Thu Apr 27 06:47:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 06:47:31 2017 +0000
tree bdda2b5ac1f24671548c0083bd4f7b4d0606eb24
parent e54832d9061c347f25a55b4d37891b10289c467d
parent 77bfcd38b78efd919e898a1165f1b99e34b6d7d7

Make IOmx registration independent of IOmxStore am: 4271c82efd
am: 77bfcd38b7

Change-Id: I86769ab87cfcd4fbbf5678e3a2d172363b820c07

services/mediacodec/main_codecservice.cpp

diff --git a/services/mediacodec/main_codecservice.cpp b/services/mediacodec/main_codecservice.cpp
index 03d18f0..c59944a 100644
--- a/services/mediacodec/main_codecservice.cpp
+++ b/services/mediacodec/main_codecservice.cpp
@@ -66,15 +66,14 @@
             LOG(ERROR) << "Cannot create IOmxStore HAL service.";
         } else if (omxStore->registerAsService() != OK) {
             LOG(ERROR) << "Cannot register IOmxStore HAL service.";
+        }
+        sp<IOmx> omx = new implementation::Omx();
+        if (omx == nullptr) {
+            LOG(ERROR) << "Cannot create IOmx HAL service.";
+        } else if (omx->registerAsService() != OK) {
+            LOG(ERROR) << "Cannot register IOmx HAL service.";
         } else {
-            sp<IOmx> omx = new implementation::Omx();
-            if (omx == nullptr) {
-                LOG(ERROR) << "Cannot create IOmx HAL service.";
-            } else if (omx->registerAsService() != OK) {
-                LOG(ERROR) << "Cannot register IOmx HAL service.";
-            } else {
-                LOG(INFO) << "Treble OMX service created.";
-            }
+            LOG(INFO) << "Treble OMX service created.";
         }
     } else {
         MediaCodecService::instantiate();