commit 4fd5fe07ba873f5cbb62d4f9eb6ffb260d42cd45
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 15 23:29:41 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 15 23:29:41 2024 +0000
tree d1e4fc41718921868d98068f4aa3413cf7751c3d
parent 9393e39c9f8d4a524ba96ae3de55ed09e34e32dc
parent 3c837e2428495498f3a93ee889cdd03ca5c990f5

Merge "Fix invalid shift of 32-bit value." into main

libs/nativewindow/include/android/hardware_buffer.h

diff --git a/libs/nativewindow/include/android/hardware_buffer.h b/libs/nativewindow/include/android/hardware_buffer.h
index 6fcb3a4..d05ff34 100644
--- a/libs/nativewindow/include/android/hardware_buffer.h
+++ b/libs/nativewindow/include/android/hardware_buffer.h
@@ -326,7 +326,7 @@
      * 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,