commit fe63f670069facb658cc3ed50c7974c2da1c505d
author John Reck <jreck@google.com> Fri May 17 19:47:34 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 17 19:47:34 2024 +0000
tree e3017f279426851563409435d490fa0097fe69a7
parent 2efe99f032870617d3a247fdaaa446d3654ee2d6
parent 934f7296573bc4d3a8b8a405359ca1522776ee8d

Merge "Use ANDROID_NATIVE_UNSIGNED_CAST() in GraphicBufferMapper::lockAsync()" into main

libs/ui/GraphicBufferMapper.cpp

diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp
index 7086e04..dc026d2 100644
--- a/libs/ui/GraphicBufferMapper.cpp
+++ b/libs/ui/GraphicBufferMapper.cpp
@@ -171,8 +171,8 @@
                                         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);
 }