commit 273b1dfa05287a0016ae1fc230cd3a5b1b7433fa
author Marissa Wall <marissaw@google.com> Thu Dec 15 12:28:47 2016 -0800
committer Marissa Wall <marissaw@google.com> Wed Mar 08 13:36:36 2017 -0800
tree ca0c785d96aa177794067ca47bbfce5fae1e7922
parent ac10819373b1ed4901f26c822484a789a7ca4be0

test-hwc2: set layer z order

Test: Add "#define HAVE_NO_SURFACE_FLINGER" to
          frameworks/native/libs/gui/BufferQueueCore.cpp.
      Recompile and flash.
      Run "mm" in frameworks/native/services/surfaceflinger/tests/hwc2.
      Push test-hwc2 to device.
      Run "adb root && adb shell stop".
      Run test case. Ex: "./test-hwc2"

Change-Id: I2c51df36d62f9d809583003b81c24dbd7a744301

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp

diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp
index 5445a77..b9ca9c3 100644
--- a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp
+++ b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.cpp
@@ -18,12 +18,13 @@
 
 #include "Hwc2TestLayer.h"
 
-Hwc2TestLayer::Hwc2TestLayer(Hwc2TestCoverage coverage)
+Hwc2TestLayer::Hwc2TestLayer(Hwc2TestCoverage coverage, uint32_t zOrder)
     : mBlendMode(coverage),
       mComposition(coverage),
       mDataspace(coverage),
       mPlaneAlpha(coverage),
-      mTransform(coverage) { }
+      mTransform(coverage),
+      mZOrder(zOrder) { }
 
 std::string Hwc2TestLayer::dump() const
 {
@@ -35,6 +36,8 @@
         dmp << property->dump();
     }
 
+    dmp << "\tz order: " << mZOrder << "\n";
+
     return dmp.str();
 }
 
@@ -70,6 +73,11 @@
     return mTransform.get();
 }
 
+uint32_t Hwc2TestLayer::getZOrder() const
+{
+    return mZOrder;
+}
+
 bool Hwc2TestLayer::advanceBlendMode()
 {
     return mBlendMode.advance();