diff options
| author | John Reck <jreck@google.com> | 2024-05-17 19:47:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-17 19:47:34 +0000 |
| commit | fe63f670069facb658cc3ed50c7974c2da1c505d (patch) | |
| tree | e3017f279426851563409435d490fa0097fe69a7 | |
| parent | 2efe99f032870617d3a247fdaaa446d3654ee2d6 (diff) | |
| parent | 934f7296573bc4d3a8b8a405359ca1522776ee8d (diff) | |
| download | native-master.tar.gz | |
Merge "Use ANDROID_NATIVE_UNSIGNED_CAST() in GraphicBufferMapper::lockAsync()" into mainHEADmastermain
| -rw-r--r-- | libs/ui/GraphicBufferMapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp index 7086e0470c..dc026d2a57 100644 --- a/libs/ui/GraphicBufferMapper.cpp +++ b/libs/ui/GraphicBufferMapper.cpp @@ -171,8 +171,8 @@ status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle, uint64_t produce int32_t* outBytesPerStride) { ATRACE_CALL(); - const uint64_t usage = static_cast<uint64_t>( - android_convertGralloc1To0Usage(producerUsage, consumerUsage)); + const uint64_t usage = static_cast<uint64_t>(ANDROID_NATIVE_UNSIGNED_CAST( + android_convertGralloc1To0Usage(producerUsage, consumerUsage))); return mMapper->lock(handle, usage, bounds, fenceFd, vaddr, outBytesPerPixel, outBytesPerStride); } |