commit deaaa404186dfdb16ddc665ba61fbd4b740291e0
author Arthur Hung <arthurhung@google.com> Fri Apr 08 02:20:56 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 08 02:20:56 2022 +0000
tree 8fb9ddd96864b12ff4eb4b173b4903f8fd243797
parent eb4065a41e76a0c148375319646b44638a181af5
parent 1b23d921f4ca602bae4ec17d478cbb319ad49265

Merge "Trace input only if the layer needs an input info" into tm-dev am: 1b23d921f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17630129

Change-Id: I34d31821519a9a6e29ddb721a1d0b4cb9dc438fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index f7e1d1e..d8a5601 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -2185,7 +2185,7 @@
 
     layerInfo->set_owner_uid(mOwnerUid);
 
-    if (traceFlags & LayerTracing::TRACE_INPUT) {
+    if ((traceFlags & LayerTracing::TRACE_INPUT) && needsInputInfo()) {
         WindowInfo info;
         if (useDrawing) {
             info = fillInputInfo(ui::Transform(), /* displayIsSecure */ true);