commit 256d76fb588efddcdad7ba240b7be480d46ca7ba
author Chavi Weingarten <chaviw@google.com> Mon Sep 09 13:54:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 09 13:54:53 2019 -0700
tree 41797fe3dc2a38bae5a0fcd1e3ad9f07568c2147
parent 43e2309351093869fb927e2e0ece2ad6452ab476
parent b419fa8686633b112b3fa153e29528cb8821ee6c

Merge "Use getLayerStack() instead of layerStack for input info" into qt-qpr1-dev
am: b419fa8686

Change-Id: I19ab690b24f61dc529495f65bd8f49076d84dbc2

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index d6e86eb..fdf9da3 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -2048,7 +2048,7 @@
     InputWindowInfo info = mDrawingState.inputInfo;
 
     if (info.displayId == ADISPLAY_ID_NONE) {
-        info.displayId = mDrawingState.layerStack;
+        info.displayId = getLayerStack();
     }
 
     ui::Transform t = getTransform();