| commit | da7ade5b509a4d78cebcb5f8232e0be167a7b442 | [log] [tgz] |
|---|---|---|
| author | Chavi Weingarten <chaviw@google.com> | Mon Aug 09 14:25:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 09 14:25:21 2021 +0000 |
| tree | 171cc3162f24ca6840a5718d47f47aae0831deda | |
| parent | eea7e0bf6c954439163b54255b918b323ab8b74d [diff] | |
| parent | 3c13a3c798b8aa9495b1ace5b42fdd835268e403 [diff] |
Merge "Set windowInfo.displayId to be the layerStack" into sc-v2-dev am: 3c13a3c798 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15485944 Change-Id: I1d1b3375b60b3937d3faf662a05a2c594ba18fe6
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 37c9634..2f995ab 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp
@@ -2299,10 +2299,7 @@ WindowInfo info = mDrawingState.inputInfo; info.id = sequence; - - if (info.displayId == ADISPLAY_ID_NONE) { - info.displayId = getLayerStack(); - } + info.displayId = getLayerStack(); // Transform that goes from "logical(rotated)" display to physical/unrotated display. // This is for when inputflinger operates in physical display-space.