commit 0a0cfb1377fde5a0bc5be567f27e3c3959e96417
author Naseer Ahmed <naseer@codeaurora.org> Sat Jun 24 03:28:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jun 24 03:28:47 2017 +0000
tree 6cd39544fa50e9374dd9f2f004f3763ba61491df
parent d813484dc10d62ac37f3e73448db7c232d6761e2
parent 26aafb60e046be29f92ecde9548e5612e8c029eb

hwc2: Reset layer flags in SetLayerBuffer
am: 26aafb60e0

Change-Id: If2868ac3005314cf74d37c9e5913c10ad66b8402

msm8996/sdm/libs/hwc2/hwc_layers.h

diff --git a/msm8996/sdm/libs/hwc2/hwc_layers.h b/msm8996/sdm/libs/hwc2/hwc_layers.h
index d1bfd6d..319f99f 100644
--- a/msm8996/sdm/libs/hwc2/hwc_layers.h
+++ b/msm8996/sdm/libs/hwc2/hwc_layers.h
@@ -113,7 +113,7 @@
 };
 
 struct SortLayersByZ {
-  bool operator()(const HWCLayer *lhs, const HWCLayer *rhs) {
+  bool operator()(const HWCLayer *lhs, const HWCLayer *rhs) const {
     return lhs->GetZ() < rhs->GetZ();
   }
 };

msm8998/sdm/libs/hwc2/hwc_layers.h

diff --git a/msm8998/sdm/libs/hwc2/hwc_layers.h b/msm8998/sdm/libs/hwc2/hwc_layers.h
index 58a45ae..205810a 100644
--- a/msm8998/sdm/libs/hwc2/hwc_layers.h
+++ b/msm8998/sdm/libs/hwc2/hwc_layers.h
@@ -110,7 +110,7 @@
 };
 
 struct SortLayersByZ {
-  bool operator()(const HWCLayer *lhs, const HWCLayer *rhs) {
+  bool operator()(const HWCLayer *lhs, const HWCLayer *rhs) const {
     return lhs->GetZ() < rhs->GetZ();
   }
 };