commit b38dbf65e012488d45a17507c0a761b2a1380def
author Sean Paul <seanpaul@chromium.org> Thu Jun 23 04:36:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 23 04:36:44 2016 +0000
tree c184777c1dc4d26f318086c281b94031e40bc434
parent 7ca774626162860edcb8232863bacb7a729d3673
parent c74c8b9339cb5fd4f00d1be6b857c6e60ba5fc49

DO NOT MERGE: drm_hwcomposer: Count all layers with content in SquashFrame
am: c74c8b9339

Change-Id: Ibfe0a03568d74f2517eb86d4f97b7339a5bb38bb

drmdisplaycompositor.cpp

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 279d5a6..92323b6 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -1061,7 +1061,7 @@
   // Make sure there is more than one layer to squash.
   size_t src_planes_with_layer = std::count_if(
       src_planes.begin(), src_planes.end(), [](DrmCompositionPlane &p) {
-        return p.type() == DrmCompositionPlane::Type::kLayer;
+        return p.type() != DrmCompositionPlane::Type::kDisable;
       });
   if (src_planes_with_layer <= 1)
     return -EALREADY;