diff options
5 files changed, 96 insertions, 3 deletions
diff --git a/services/surfaceflinger/CompositionEngine/Android.bp b/services/surfaceflinger/CompositionEngine/Android.bp index 4752fb5b12..19478e7f65 100644 --- a/services/surfaceflinger/CompositionEngine/Android.bp +++ b/services/surfaceflinger/CompositionEngine/Android.bp @@ -69,7 +69,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", @@ -91,6 +94,7 @@ cc_library { "src/OutputLayer.cpp", "src/OutputLayerCompositionState.cpp", "src/RenderSurface.cpp", + "src/UdfpsExtension.cpp", ], local_include_dirs: ["include"], export_include_dirs: ["include"], @@ -119,6 +123,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..4306cb4a02 --- /dev/null +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/UdfpsExtension.h @@ -0,0 +1,29 @@ +/* + * Copyright 2021-2022 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" +#define UDFPS_LAYER_NAME "UdfpsControllerOverlay" +#define UDFPS_TOUCHED_LAYER_NAME "SurfaceView[UdfpsControllerOverlay](BLAST)" + +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 ac314e0db8..ee1fcb33e4 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/HwcAsyncWorker.h> #include <compositionengine/impl/Output.h> #include <compositionengine/impl/OutputCompositionState.h> @@ -854,7 +855,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 @@ -868,6 +872,16 @@ 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) && + (strncmp(nextLayer->getLayerFE().getDebugName(), UDFPS_TOUCHED_LAYER_NAME, + strlen(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 e861eecf54..8de24c7779 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> @@ -439,7 +440,17 @@ 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 ((strncmp(getLayerFE().getDebugName(), UDFPS_LAYER_NAME, strlen(UDFPS_LAYER_NAME)) == 0) || + (strncmp(getLayerFE().getDebugName(), UDFPS_BIOMETRIC_PROMPT_LAYER_NAME, + strlen(UDFPS_BIOMETRIC_PROMPT_LAYER_NAME)) == 0)) { + z_udfps = getUdfpsZOrder(z, false); + } else if (strncmp(getLayerFE().getDebugName(), UDFPS_TOUCHED_LAYER_NAME, + strlen(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 |