summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-07-15 23:55:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-07-15 23:55:00 +0000
commit346a37f7d850eb02fd354493fb4216875cc850e5 (patch)
tree1f1ecd166ed57346cd0448a572eb911c6bcc21cd
parentfc4d8c6035d22fdb0c09a317df5aa6625735ec26 (diff)
parent4fd5fe07ba873f5cbb62d4f9eb6ffb260d42cd45 (diff)
Merge "Fix invalid shift of 32-bit value." into main am: 4fd5fe07ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3168962 Change-Id: Ice525842c0700957ae3c75e1323015f2ba61cb66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/nativewindow/include/android/hardware_buffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/nativewindow/include/android/hardware_buffer.h b/libs/nativewindow/include/android/hardware_buffer.h
index 6fcb3a4842..d05ff3457a 100644
--- a/libs/nativewindow/include/android/hardware_buffer.h
+++ b/libs/nativewindow/include/android/hardware_buffer.h
@@ -326,7 +326,7 @@ enum AHardwareBuffer_UsageFlags {
* COMPOSER_OVERLAY, the system will try to prioritize the buffer receiving
* an overlay plane & avoid caching it in intermediate composition buffers.
*/
- AHARDWAREBUFFER_USAGE_FRONT_BUFFER = 1UL << 32,
+ AHARDWAREBUFFER_USAGE_FRONT_BUFFER = 1ULL << 32,
AHARDWAREBUFFER_USAGE_VENDOR_0 = 1ULL << 28,
AHARDWAREBUFFER_USAGE_VENDOR_1 = 1ULL << 29,