commit f7e10c82b04e0f6a2a445609144612ac2f47c8a8
author Chia-I Wu <olv@google.com> Fri Sep 08 22:31:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 08 22:31:32 2017 +0000
tree d6e3121690ddf13d41269ce2c74be8202af1dd39
parent 9db7166d7cf1ef4b9b1a0a997fada57318851e74
parent c0b2b0c457c45e09479029748e07e6d1b1c9d457

Merge "surfaceflinger: handle executeCommands transaction errors" into oc-mr1-dev

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
index ac739a2..cf01ad0 100644
--- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
@@ -755,7 +755,7 @@
     }
 
     Error error = kDefaultError;
-    mClient->executeCommands(commandLength, commandHandles,
+    auto ret = mClient->executeCommands(commandLength, commandHandles,
             [&](const auto& tmpError, const auto& tmpOutChanged,
                 const auto& tmpOutLength, const auto& tmpOutHandles)
             {
@@ -788,6 +788,11 @@
                     error = Error::NO_RESOURCES;
                 }
             });
+    // executeCommands can fail because of out-of-fd and we do not want to
+    // abort() in that case
+    if (!ret.isOk()) {
+        ALOGE("executeCommands failed because of %s", ret.description().c_str());
+    }
 
     if (error == Error::NONE) {
         std::vector<CommandReader::CommandError> commandErrors =