commit e574cb16fc962088f4838826fb1afbaf333fdb66
author Chia-I Wu <olv@google.com> Fri Sep 08 22:42:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 08 22:42:08 2017 +0000
tree 3125c3afa1c1244adcde732b04742462dc393dda
parent ccf701479059699959ee0e33ab080221d62e367e
parent f797decfb2d21b0cf4340202b3c49a290d386d90

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

Change-Id: Ib09ec57681b29a15eea015ecfffa1b858ca76756

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

diff --git a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
index 433a224..7d6d988 100644
--- a/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
+++ b/services/surfaceflinger/DisplayHardware/ComposerHal.cpp
@@ -751,7 +751,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)
             {
@@ -784,6 +784,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 =