diff options
| author | 2022-07-01 08:54:02 +0000 | |
|---|---|---|
| committer | 2022-07-01 08:54:02 +0000 | |
| commit | 201f54d7c613bf4c2011cc0f3380dcf63ef6712d (patch) | |
| tree | 50a7213655fb6bf6c895eed1aa7505c2d32731fd /services/surfaceflinger/Layer.cpp | |
| parent | 58a3381c4fdb1d9e2b65ed7ed5f6ee578da5ffaf (diff) | |
| parent | 4c0e43192b7b9dda53e49fd3a41ba5efc1980366 (diff) | |
Merge "Allow windowhandles with NO_INPUT_CHANNEL - DO NOT MERGE" into sc-dev
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 95cfb28b44..694230268d 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -2152,7 +2152,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}); @@ -2400,7 +2400,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 { |