commit 1cd789cd2b300427467586f4ec721a8123f118b7
author Marissa Wall <marissaw@google.com> Fri Jan 27 12:55:36 2017 -0800
committer Marissa Wall <marissaw@google.com> Wed Mar 08 13:36:36 2017 -0800
tree 4324e09a1ccf0de3e586d1047b2a9e48afc0fe01
parent f7618ed1b4d806e06c872c0fccce57163cf93b6a

test-hwc2: validate display

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: I9a9df2902213d99d4f043e3bdea1e5e2fc77b01d

services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h

diff --git a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h
index 86c3649..17f5079 100644
--- a/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h
+++ b/services/surfaceflinger/tests/hwc2/Hwc2TestLayer.h
@@ -36,11 +36,13 @@
 
     int getBuffer(buffer_handle_t* outHandle,
             android::base::unique_fd* outAcquireFence);
+    int getBuffer(buffer_handle_t* outHandle, int32_t* outAcquireFence);
 
     void setZOrder(uint32_t zOrder);
     void setVisibleRegion(const android::Region& region);
 
     void reset();
+    bool advance();
 
     hwc2_blend_mode_t      getBlendMode() const;
     Area                   getBufferArea() const;
@@ -71,8 +73,9 @@
 
 private:
     std::array<Hwc2TestContainer*, 10> mProperties = {{
-        &mBlendMode, &mBufferArea, &mColor, &mComposition, &mDataspace,
-        &mDisplayFrame, &mPlaneAlpha, &mSourceCrop, &mSurfaceDamage, &mTransform
+        &mTransform, &mColor, &mDataspace, &mPlaneAlpha, &mSourceCrop,
+        &mSurfaceDamage, &mBlendMode, &mBufferArea, &mDisplayFrame,
+        &mComposition
     }};
 
     Hwc2TestBuffer mBuffer;