summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joel Galenson <jgalenson@google.com> 2017-12-21 18:31:18 +0000
committer android-build-merger <android-build-merger@google.com> 2017-12-21 18:31:18 +0000
commit7600fb86f35545871a79b8330697e15f9da63570 (patch)
tree17d96130ce00646fc5cc64201f0ea871d1ce003d
parentf305711ae5675655a0bf3a64b525840f5749c78a (diff)
parentbfbf7c2c9a8c5b8216e1188c71a5d78ee82723e5 (diff)
Merge "Fix surfaceflinger on integer sanitized builds."
am: bfbf7c2c9a Change-Id: Iae676c5bfecfceb6f2c158755609c1331aa6a787
-rwxr-xr-xservices/surfaceflinger/Layer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 7a6d20457f..70c702b6d3 100755
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -2715,7 +2715,7 @@ void Layer::traverseInReverseZOrder(LayerVector::StateSet stateSet,
LayerVector list = makeTraversalList(stateSet);
int32_t i = 0;
- for (i = list.size()-1; i>=0; i--) {
+ for (i = int32_t(list.size()) - 1; i >= 0; i--) {
const auto& relative = list[i];
if (relative->getZ() < 0) {
break;