diff options
Diffstat (limited to 'services')
6 files changed, 103 insertions, 4 deletions
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp index e701fa9ed9..1aee633766 100644 --- a/services/surfaceflinger/BufferQueueLayer.cpp +++ b/services/surfaceflinger/BufferQueueLayer.cpp @@ -25,6 +25,7 @@ #include "BufferQueueLayer.h" #include <compositionengine/LayerFECompositionState.h> +#include <compositionengine/UdfpsExtension.h> #include <gui/BufferQueueConsumer.h> #include <system/window.h> @@ -522,10 +523,17 @@ status_t BufferQueueLayer::setDefaultBufferProperties(uint32_t w, uint32_t h, Pi ALOGE("dimensions too large %" PRIu32 " x %" PRIu32, w, h); return BAD_VALUE; } + uint64_t usageBits = getEffectiveUsage(0); + + if (mName == UDFPS_LAYER_NAME || mName == UDFPS_BIOMETRIC_PROMPT_LAYER_NAME) { + usageBits = getUdfpsUsageBits(usageBits, false); + } else if (mName == UDFPS_TOUCHED_LAYER_NAME) { + usageBits = getUdfpsUsageBits(usageBits, true); + } setDefaultBufferSize(w, h); mConsumer->setDefaultBufferFormat(format); - mConsumer->setConsumerUsageBits(getEffectiveUsage(0)); + mConsumer->setConsumerUsageBits(usageBits); return NO_ERROR; } diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp index adc18b706e..5f01359354 100644 --- a/services/surfaceflinger/CompositionEngine/Android.bp +++ b/services/surfaceflinger/CompositionEngine/Android.bp @@ -60,7 +60,10 @@ libdisplayconfig_cc_defaults { cc_library { name: "libcompositionengine", - defaults: ["libcompositionengine_defaults"], + defaults: [ + "libcompositionengine_defaults", + "surfaceflinger_udfps_lib_defaults", + ], srcs: [ "src/planner/CachedSet.cpp", "src/planner/Flattener.cpp", @@ -81,6 +84,7 @@ cc_library { "src/OutputLayer.cpp", "src/OutputLayerCompositionState.cpp", "src/RenderSurface.cpp", + "src/UdfpsExtension.cpp", ], local_include_dirs: ["include"], export_include_dirs: ["include"], @@ -109,6 +113,14 @@ cc_library { export_include_dirs: ["include"], } +cc_library_static { + name: "surfaceflinger_udfps_lib", + srcs: [ + "src/UdfpsExtension.cpp", + ], + export_include_dirs: ["include"], +} + cc_test { name: "libcompositionengine_test", test_suites: ["device-tests"], diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h new file mode 100644 index 0000000000..ae688d4c30 --- /dev/null +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h @@ -0,0 +1,29 @@ +/* + * Copyright 2021 The LineageOS Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <stdint.h> + +#ifndef __UDFPS_EXTENSION__H__ +#define __UDFPS_EXTENSION__H__ + +#define UDFPS_BIOMETRIC_PROMPT_LAYER_NAME "BiometricPrompt#0" +#define UDFPS_LAYER_NAME "UdfpsController#0" +#define UDFPS_TOUCHED_LAYER_NAME "SurfaceView[UdfpsController](BLAST)#0" + +extern uint32_t getUdfpsZOrder(uint32_t z, bool touched); +extern uint64_t getUdfpsUsageBits(uint64_t usageBits, bool touched); + +#endif /* __UDFPS_EXTENSION__H__ */ diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index a63fd84463..f2b3b97103 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp @@ -22,6 +22,7 @@ #include <compositionengine/LayerFE.h> #include <compositionengine/LayerFECompositionState.h> #include <compositionengine/RenderSurface.h> +#include <compositionengine/UdfpsExtension.h> #include <compositionengine/impl/Output.h> #include <compositionengine/impl/OutputCompositionState.h> #include <compositionengine/impl/OutputLayer.h> @@ -821,7 +822,10 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition() const { compositionengine::OutputLayer* layerRequestingBgComposition = nullptr; - for (auto* layer : getOutputLayersOrderedByZ()) { + for (size_t i = 0; i < getOutputLayerCount(); i++) { + compositionengine::OutputLayer* layer = getOutputLayerOrderedByZByIndex(i); + compositionengine::OutputLayer* nextLayer = getOutputLayerOrderedByZByIndex(i + 1); + auto* compState = layer->getLayerFE().getCompositionState(); // If any layer has a sideband stream, we will disable blurs. In that case, we don't @@ -835,6 +839,15 @@ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition if (compState->backgroundBlurRadius > 0 || compState->blurRegions.size() > 0) { layerRequestingBgComposition = layer; } + + // If the next layer is the Udfps touched layer, enable client composition for it + // because that somehow leads to the Udfps touched layer getting device composition + // consistently. + if ((nextLayer != nullptr && layerRequestingBgComposition == nullptr) && + (strcmp(nextLayer->getLayerFE().getDebugName(), UDFPS_TOUCHED_LAYER_NAME) == 0)) { + layerRequestingBgComposition = layer; + break; + } } return layerRequestingBgComposition; } diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp index 2b9c8e84d4..52c023c675 100644 --- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp +++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp @@ -19,6 +19,7 @@ #include <compositionengine/DisplayColorProfile.h> #include <compositionengine/LayerFECompositionState.h> #include <compositionengine/Output.h> +#include <compositionengine/UdfpsExtension.h> #include <compositionengine/impl/HwcBufferCache.h> #include <compositionengine/impl/OutputCompositionState.h> #include <compositionengine/impl/OutputLayer.h> @@ -410,7 +411,16 @@ void OutputLayer::writeOutputDependentGeometryStateToHWC(HWC2::Layer* hwcLayer, sourceCrop.bottom, to_string(error).c_str(), static_cast<int32_t>(error)); } - if (auto error = hwcLayer->setZOrder(z); error != hal::Error::NONE) { + + uint32_t z_udfps = z; + if ((strcmp(getLayerFE().getDebugName(), UDFPS_LAYER_NAME) == 0) + || (strcmp(getLayerFE().getDebugName(), UDFPS_BIOMETRIC_PROMPT_LAYER_NAME) == 0)) { + z_udfps = getUdfpsZOrder(z, false); + } else if (strcmp(getLayerFE().getDebugName(), UDFPS_TOUCHED_LAYER_NAME) == 0) { + z_udfps = getUdfpsZOrder(z, true); + } + + if (auto error = hwcLayer->setZOrder(z_udfps); error != hal::Error::NONE) { ALOGE("[%s] Failed to set Z %u: %s (%d)", getLayerFE().getDebugName(), z, to_string(error).c_str(), static_cast<int32_t>(error)); } diff --git a/services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp b/services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp new file mode 100644 index 0000000000..2d9d086dd2 --- /dev/null +++ b/services/surfaceflinger/CompositionEngine/src/UdfpsExtension.cpp @@ -0,0 +1,27 @@ +/* + * Copyright 2020 The LineageOS Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef TARGET_PROVIDES_UDFPS_LIB +#include <compositionengine/UdfpsExtension.h> + +uint32_t getUdfpsZOrder(uint32_t z, __unused bool touched) { + return z; +} + +uint64_t getUdfpsUsageBits(uint64_t usageBits, __unused bool touched) { + return usageBits; +} +#endif |