commit 66add5d51fdc753bca43340ecbd0de5079ccedca
author android-build-team Robot <android-build-team-robot@google.com> Fri Sep 22 08:11:47 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Sep 22 08:11:47 2017 +0000
tree ebe535181180d602413a7eec93da83cfb381702f
parent 974f7a4979cb5fb452ad38494de5d095e4752c1e
parent e64acba60e031af0b0a9617b8415008e744b4a40

release-request-ed8626b9-4479-4c76-9207-5f511f136606-for-git_pi-release-4354758 snap-temp-L65900000105223161

Change-Id: I175d5ecdbc5ef430328faef4645f4857276b8079

drmdisplaycomposition.cpp

diff --git a/drmdisplaycomposition.cpp b/drmdisplaycomposition.cpp
index 293160b..0f8084b 100644
--- a/drmdisplaycomposition.cpp
+++ b/drmdisplaycomposition.cpp
@@ -379,6 +379,9 @@
     if (!i.plane())
       continue;
 
+    // make sure that source layers are ordered based on zorder
+    std::sort(i.source_layers().begin(), i.source_layers().end());
+
     std::vector<DrmPlane *> *container;
     if (i.plane()->type() == DRM_PLANE_TYPE_PRIMARY)
       container = primary_planes;