| commit | b21cdfb86612d67f3c76d01f32297914fb372548 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Sun Jan 13 01:52:36 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Jan 13 01:52:36 2019 -0800 |
| tree | 1762b635a9759e90f712c94cf5eb1298ceb913ff | |
| parent | 9fa1c9ccda09c8422405ea7ac005ca4c7b71c717 [diff] | |
| parent | 3df110feaee8e1deb2338f7db2a016ebadee3296 [diff] |
Fix comparator operator() definition. am: a6a529236e am: 3df110feae Change-Id: Ide011a450b7d7154904cc80da43e402725ad26ce
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