| commit | a464d0d640224526dca7e0258aa87e2f614031b5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 06 15:33:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 06 15:33:11 2022 +0000 |
| tree | 5de4615788ae88ffd724988ed2b850dcd753fe78 | |
| parent | c40390f167924c58305782fe1602bfb94e2304bf [diff] | |
| parent | 61ba79e876e448896b2f8a95d4cc1ebf79c78df3 [diff] |
Merge "fix validateBufferDescriptorInfo error when usage bits were 32-bits" am: 61ba79e876 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2200464 Change-Id: Ifb25e0f116d64b902db49c56890504466c3194ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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));