commit 3390fe673196e382fecbd1eadd40cec7e49efe6c
author Joel Galenson <jgalenson@google.com> Thu Dec 21 19:52:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 21 19:52:38 2017 +0000
tree e094b9c2398262a6042223229a693653616a3b35
parent 5acfb78d45c6290c95f75655caf4ca88fb03b3a1
parent 7600fb86f35545871a79b8330697e15f9da63570

Merge "Fix surfaceflinger on integer sanitized builds." am: bfbf7c2c9a
am: 7600fb86f3

Change-Id: I6e4f2c5003c6b9109cc1c09f31b2c1465116d17f

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 7a6d204..70c702b 100755
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -2715,7 +2715,7 @@
     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;