1 files changed, 13 insertions, 15 deletions
diff --git a/hwc3/ComposerClient.cpp b/hwc3/ComposerClient.cpp
index 7324e5c..7a3c72a 100644
--- a/hwc3/ComposerClient.cpp
+++ b/hwc3/ComposerClient.cpp
@@ -33,25 +33,11 @@ bool ComposerClient::init() {
         return false;
     }
 
-    mCommandEngine = std::make_unique<ComposerCommandEngine>(mHal, mResources.get());
-    if (mCommandEngine == nullptr) {
-        return false;
-    }
-    if (!mCommandEngine->init()) {
-        mCommandEngine = nullptr;
-        return false;
-    }
-
     return true;
 }
 
 ComposerClient::~ComposerClient() {
     DEBUG_FUNC();
-    // not initialized
-    if (!mCommandEngine) {
-        return;
-    }
-
     LOG(DEBUG) << "destroying composer client";
 
     mHal->unregisterEventCallback();
@@ -111,7 +97,19 @@ ndk::ScopedAStatus ComposerClient::destroyVirtualDisplay(int64_t display) {
 ndk::ScopedAStatus ComposerClient::executeCommands(const std::vector<DisplayCommand>& commands,
                                                    std::vector<CommandResultPayload>* results) {
     DEBUG_FUNC();
-    auto err = mCommandEngine->execute(commands, results);
+    ComposerCommandEngine engine(mHal, mResources.get());
+
+    auto err = engine.init();
+    if (err != ::android::NO_ERROR) {
+        LOG(ERROR) << "executeCommands(): init ComposerCommandEngine failed " << err;
+        return TO_BINDER_STATUS(err);
+    }
+
+    err = engine.execute(commands, results);
+    if (err != ::android::NO_ERROR) {
+        LOG(ERROR) << "executeCommands(): execute failed " << err;
+        return TO_BINDER_STATUS(err);
+    }
     return TO_BINDER_STATUS(err);
 }