commit 7600fb86f35545871a79b8330697e15f9da63570
author Joel Galenson <jgalenson@google.com> Thu Dec 21 18:31:18 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 21 18:31:18 2017 +0000
tree 17d96130ce00646fc5cc64201f0ea871d1ce003d
parent f305711ae5675655a0bf3a64b525840f5749c78a
parent bfbf7c2c9a8c5b8216e1188c71a5d78ee82723e5

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

Change-Id: Iae676c5bfecfceb6f2c158755609c1331aa6a787

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;