commit bdba6021d7b7ed9f0a6ec0fa3899bf3bab76f41a
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Mon Sep 09 20:55:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 20:55:26 2019 +0000
tree 63dcb40d6f9aee517bca08b32fbf5e2dbe30deb6
parent 256d76fb588efddcdad7ba240b7be480d46ca7ba
parent 328d41ebe33c6cfb7978da715af134bd96b1a19c

Merge "Merge "lshal: update test manifest to 2.0" am: 5a99fe853e am: 4c89b924ef am: be9c62877b" into qt-qpr1-dev-plus-aosp

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();