From 6f55c22fd40b56dc1080905c1161efb4a3a7e756 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Mon, 1 Jun 2020 03:33:06 +1000 Subject: surfaceflinger: change usageBits type to uint64_t with uint32_t, it will lose the bits and making the usageBits invalid. Co-authored-by: Michael Benedict Change-Id: I7b873ddd80e904dfc7fa8c3100ffbdf5f50d83e1 --- services/surfaceflinger/BufferQueueLayer.cpp | 4 ++-- .../CompositionEngine/include/compositionengine/FodExtension.h | 2 +- services/surfaceflinger/CompositionEngine/src/FodExtension.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp index cf7c15d63..18c74e6c6 100644 --- a/services/surfaceflinger/BufferQueueLayer.cpp +++ b/services/surfaceflinger/BufferQueueLayer.cpp @@ -563,7 +563,7 @@ status_t BufferQueueLayer::setDefaultBufferProperties(uint32_t w, uint32_t h, Pi return BAD_VALUE; } - uint32_t usageBits = 0; + uint64_t usageBits = getEffectiveUsage(0); if (mName == FOD_LAYER_NAME) { usageBits = getFodUsageBits(usageBits, false); @@ -575,7 +575,7 @@ status_t BufferQueueLayer::setDefaultBufferProperties(uint32_t w, uint32_t h, Pi setDefaultBufferSize(w, h); mConsumer->setDefaultBufferFormat(format); - mConsumer->setConsumerUsageBits(getEffectiveUsage(usageBits)); + mConsumer->setConsumerUsageBits(usageBits); return NO_ERROR; } diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/FodExtension.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/FodExtension.h index 816a05950..3585f63d9 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/FodExtension.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/FodExtension.h @@ -23,6 +23,6 @@ #define FOD_TOUCHED_LAYER_NAME "Fingerprint on display.touched#0" extern uint32_t getFodZOrder(uint32_t z, bool touched); -extern uint32_t getFodUsageBits(uint32_t usageBits, bool touched); +extern uint64_t getFodUsageBits(uint64_t usageBits, bool touched); #endif /* __FOD_EXTENSION__H__ */ diff --git a/services/surfaceflinger/CompositionEngine/src/FodExtension.cpp b/services/surfaceflinger/CompositionEngine/src/FodExtension.cpp index 780db4b92..6f9d44e7f 100644 --- a/services/surfaceflinger/CompositionEngine/src/FodExtension.cpp +++ b/services/surfaceflinger/CompositionEngine/src/FodExtension.cpp @@ -22,7 +22,7 @@ uint32_t getFodZOrder(uint32_t z, bool touched) { return z; } -uint32_t getFodUsageBits(uint32_t usageBits, bool touched) { +uint64_t getFodUsageBits(uint64_t usageBits, bool touched) { (void) touched; return usageBits; } -- cgit v1.2.3