| commit | 3df110feaee8e1deb2338f7db2a016ebadee3296 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Sun Jan 13 01:47:32 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Jan 13 01:47:32 2019 -0800 |
| tree | a2847d13edb0acb1fab853338148c4f6614a42b2 | |
| parent | 228d0c28c34bd9bf125bfe29162bdfa6b44e8c17 [diff] | |
| parent | a6a529236ea307088e522b3e661f74a0537c99b7 [diff] |
Fix comparator operator() definition. am: a6a529236e Change-Id: I10a81993c08e251f2072ba6d34e93861a9f9e116
diff --git a/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp b/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp index 366d641..3d138f7 100644 --- a/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp +++ b/graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp
@@ -1921,8 +1921,8 @@ mHwc1Id(0), mHasUnsupportedPlaneAlpha(false) {} -bool HWC2On1Adapter::SortLayersByZ::operator()( - const std::shared_ptr<Layer>& lhs, const std::shared_ptr<Layer>& rhs) { +bool HWC2On1Adapter::SortLayersByZ::operator()(const std::shared_ptr<Layer>& lhs, + const std::shared_ptr<Layer>& rhs) const { return lhs->getZ() < rhs->getZ(); }
diff --git a/graphics/composer/2.1/utils/hwc2on1adapter/include/hwc2on1adapter/HWC2On1Adapter.h b/graphics/composer/2.1/utils/hwc2on1adapter/include/hwc2on1adapter/HWC2On1Adapter.h index 3badfce..da771dc 100644 --- a/graphics/composer/2.1/utils/hwc2on1adapter/include/hwc2on1adapter/HWC2On1Adapter.h +++ b/graphics/composer/2.1/utils/hwc2on1adapter/include/hwc2on1adapter/HWC2On1Adapter.h
@@ -130,8 +130,8 @@ class SortLayersByZ { public: - bool operator()(const std::shared_ptr<Layer>& lhs, - const std::shared_ptr<Layer>& rhs); + bool operator()(const std::shared_ptr<Layer>& lhs, + const std::shared_ptr<Layer>& rhs) const; }; // The semantics of the fences returned by the device differ between