commit 77bfcd38b78efd919e898a1165f1b99e34b6d7d7
author Pawin Vongmasa <pawin@google.com> Thu Apr 27 06:39:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 06:39:21 2017 +0000
tree 6b0d4c774c11b1af55ca97a4820c4da29c99f907
parent 3854e6efb9b8f5e883bcf3ae56ab4837607fd191
parent 4271c82efd7c59f6e75e09fa748769bad4cfeee2

Make IOmx registration independent of IOmxStore
am: 4271c82efd

Change-Id: I3278a860b0dcd39a4107b082dfc03d72fe8375dc

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();