DO NOT MERGE: drm_hwcomposer: Count all layers with content in SquashFrameandroid-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-dr1-release

am: c74c8b9339

Change-Id: Ibfe0a03568d74f2517eb86d4f97b7339a5bb38bb

1 files changed, 1 insertions, 1 deletions

diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp
index 279d5a6..92323b6 100644
--- a/drmdisplaycompositor.cpp
+++ b/drmdisplaycompositor.cpp
@@ -1061,7 +1061,7 @@ int DrmDisplayCompositor::SquashFrame(DrmDisplayComposition *src,
   // 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;