commit 2a795df78a35fb1e8c4e90dc12fab7441203061a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jul 16 18:34:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 16 18:34:05 2024 +0000
tree 5b87b5d4d9d5560b0a9a61ac15041b3e78ef73bb
parent 346a37f7d850eb02fd354493fb4216875cc850e5
parent 27fc9f1fb7d447f17335da2b5bac186d0b1fcffc

Merge "Handle non-split pointers for multi-device case" into aosp-main-future

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,