commit 61ba79e876e448896b2f8a95d4cc1ebf79c78df3
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 06 15:08:38 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 06 15:08:38 2022 +0000
tree 5de4615788ae88ffd724988ed2b850dcd753fe78
parent 887cda512303515a8ddadf10c9f45008a975bf16
parent 5480b2129e55a9b00f789e9b1caa42656646634e

Merge "fix validateBufferDescriptorInfo error when usage bits were 32-bits"

libs/ui/GraphicBuffer.cpp

diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index 3732fee..429760f 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -465,7 +465,7 @@
         if (flattenWordCount == 13) {
             usage = (uint64_t(buf[12]) << 32) | uint32_t(buf[6]);
         } else {
-            usage = uint64_t(usage_deprecated);
+            usage = uint64_t(ANDROID_NATIVE_UNSIGNED_CAST(usage_deprecated));
         }
         native_handle* h =
                 native_handle_create(static_cast<int>(numFds), static_cast<int>(numInts));