commit 5c1cb99f2459e4dbf1a2535afc4eaa342047481c
author Linux Build Service Account <lnxbuild@localhost> Sat Dec 06 14:38:41 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Dec 06 14:38:41 2014 -0800
tree db29d529428c09570b379528c644bbeab009eb57
parent 6c9cdd5138bff61ffece4f7a200ad0639325eb0d
parent a7a354af350cc3cbdd64542d42d5b2cd259d44af

Merge "sde: Fix hang when CompManager:Prepare() fails with error"

displayengine/libs/core/comp_manager.cpp

diff --git a/displayengine/libs/core/comp_manager.cpp b/displayengine/libs/core/comp_manager.cpp
index fa9349e..916d558 100755
--- a/displayengine/libs/core/comp_manager.cpp
+++ b/displayengine/libs/core/comp_manager.cpp
@@ -167,7 +167,7 @@
       // Composition strategies exhausted. Resource Manager could not allocate resources even for
       // GPU composition. This will never happen.
       DLOGE("Unexpected failure. Composition strategies exhausted.");
-      return error;
+      break;
     }
 
     error = res_mgr_.Acquire(display_resource_ctx, hw_layers);
@@ -181,7 +181,7 @@
   }
   res_mgr_.Stop(display_resource_ctx);
 
-  return kErrorNone;
+  return error;
 }
 
 void CompManager::PostPrepare(Handle display_ctx, HWLayers *hw_layers) {