commit 4681d7506ac847b92cb53612b1771cc18ce85cac
author Pawin Vongmasa <pawin@google.com> Wed Apr 26 21:24:30 2017 -0700
committer gitbuildkicker <android-build@google.com> Thu Apr 27 12:43:29 2017 -0700
tree c7a3d4450357fd0b8a0af26e3996c2b51fcf3f80
parent 22a3f2089b0398a2c9d88c4823565621eb717d02

Make IOmx registration independent of IOmxStore

This CL allows IOmx to attempt registration even when IOmxStore fails to
register.

Test: Manual use of Camera

Bug: 37657124
Bug: 37726880
Change-Id: I108c507326ee55c17acc524233e70afa5cb5a4f0
(cherry picked from commit 4271c82efd7c59f6e75e09fa748769bad4cfeee2)

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