commit 4caeb7e5e7362e369bdf641ab42554cb33b923d4
author Michael Spang <spang@google.com> Sat Sep 09 01:08:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 09 01:08:05 2017 +0000
tree 2af77b435fc7a804c8e23dc7d38374f27bc4c39c
parent f797decfb2d21b0cf4340202b3c49a290d386d90
parent 9e6c95deda2649b510261fbf3afdee7fb955266b

Merge "Fix stack use-after-scope in InputReader" into oc-mr1-dev
am: 9e6c95deda

Change-Id: Ia51f56bca86f5e04cef4151ca2692bcf49e25aeb

services/inputflinger/InputReader.cpp

diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index 935d0f6..d4266f6 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -257,7 +257,7 @@
         const String8* uniqueDisplayId, DisplayViewport* outViewport) const {
     const DisplayViewport* viewport = NULL;
     if (viewportType == ViewportType::VIEWPORT_VIRTUAL && uniqueDisplayId != NULL) {
-        for (DisplayViewport currentViewport : mVirtualDisplays) {
+        for (const DisplayViewport& currentViewport : mVirtualDisplays) {
             if (currentViewport.uniqueId == *uniqueDisplayId) {
                 viewport = &currentViewport;
                 break;