Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3900c6d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use ANDROID_NATIVE_UNSIGNED_CAST() in GraphicBufferMapper::lockAsync()... 

Merge "Use ANDROID_NATIVE_UNSIGNED_CAST() in GraphicBufferMapper::lockAsync() and GraphicBuffer::lockAsync()" into main
parents 357c2ed3 a3d7333e

libs/ui/GraphicBuffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -388,8 +388,8 @@ status_t GraphicBuffer::lockAsync(uint64_t inProducerUsage, uint64_t inConsumerU 
        }

    }



    const uint64_t usage = static_cast<uint64_t>(

            android_convertGralloc1To0Usage(inProducerUsage, inConsumerUsage));

    const uint64_t usage = static_cast<uint64_t>(ANDROID_NATIVE_UNSIGNED_CAST(

            android_convertGralloc1To0Usage(inProducerUsage, inConsumerUsage)));



    auto result = getBufferMapper().lock(handle, usage, rect, base::unique_fd{fenceFd});

libs/ui/GraphicBufferMapper.cpp

+4 −2
Original line number Diff line number Diff line
@@ -208,8 +208,10 @@ status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle, uint32_t usage, 
status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle, uint64_t producerUsage,

                                        uint64_t consumerUsage, const Rect& bounds, void** vaddr,

                                        int fenceFd) {

    return lockAsync(handle, android_convertGralloc1To0Usage(producerUsage, consumerUsage), bounds,

                     vaddr, fenceFd);

    return lockAsync(handle,

                     ANDROID_NATIVE_UNSIGNED_CAST(

                             android_convertGralloc1To0Usage(producerUsage, consumerUsage)),

                     bounds, vaddr, fenceFd);

}



status_t GraphicBufferMapper::lockAsyncYCbCr(buffer_handle_t handle, uint32_t usage,