commit b7c88afd7fe9c222ae3c6bbaeea236e4b538dc3c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 06 17:38:59 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 06 17:38:59 2022 +0000
tree 46dc47c269264058906c0d226d23fc87fbed53af
parent 7e2afbb8edeed8a2caa57667e7ed9e1987c2b659
parent 7ddd491721d4de8bd938f61b3ebc0cb59865745f

Merge "fix validateBufferDescriptorInfo error when usage bits were 32-bits" am: 61ba79e876 am: a464d0d640 am: 5563143a0c am: f562fc1524 am: 7ddd491721

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2200464

Change-Id: I77e06863f673caef2ee00c2a974ff073f7a57a13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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));