| commit | f562fc15244da12beb524396684512c73929007a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 06 16:44:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 06 16:44:55 2022 +0000 |
| tree | ec668624cb7490e371083cc7b90aa5ee31e45bad | |
| parent | b69796b74ff61dc43d5143f9017caa7620f57e16 [diff] | |
| parent | 5563143a0c0436f107ff8587d1528e5897891cdf [diff] |
Merge "fix validateBufferDescriptorInfo error when usage bits were 32-bits" am: 61ba79e876 am: a464d0d640 am: 5563143a0c Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2200464 Change-Id: Ieae5d737a02d9ea6c2d0adf0fbfd43c6abc443e0 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));