diff options
| author | 2022-07-01 09:20:38 +0000 | |
|---|---|---|
| committer | 2022-07-01 09:20:38 +0000 | |
| commit | 2fb2b9b16d200748736a9fdf41edf6c6de2eac21 (patch) | |
| tree | 222d2606a4d0e6bbf9320e8fa6202ad0a6d76773 /services/surfaceflinger/Layer.cpp | |
| parent | d2c9d0517b81b93cd20ef39f9cf19cf1dd9a4b7e (diff) | |
| parent | 4c0e43192b7b9dda53e49fd3a41ba5efc1980366 (diff) | |
Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE am: 4c0e43192b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18029505
Change-Id: I0f8e82ad59e55e4e019988a596c161fa52a9a00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'services/surfaceflinger/Layer.cpp')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 71e4791fe9..6a967d2982 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -2151,7 +2151,7 @@ void Layer::writeToProtoCommonState(LayerProto* layerInfo, LayerVector::StateSet layerInfo->set_owner_uid(mOwnerUid); } - if (traceFlags & SurfaceTracing::TRACE_INPUT) { + if (traceFlags & SurfaceTracing::TRACE_INPUT && needsInputInfo()) { InputWindowInfo info; if (useDrawing) { info = fillInputInfo({nullptr}); @@ -2399,7 +2399,8 @@ sp<Layer> Layer::getClonedRoot() { } bool Layer::hasInputInfo() const { - return mDrawingState.inputInfo.token != nullptr; + return mDrawingState.inputInfo.token != nullptr || + mDrawingState.inputInfo.inputFeatures.test(InputWindowInfo::Feature::NO_INPUT_CHANNEL); } bool Layer::canReceiveInput() const { |