| commit | b03bafc75d992d16c7c4f665c7ba15531bb2ca6c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Jul 16 00:15:54 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 16 00:15:54 2024 +0000 |
| tree | adb7f0e281497491b886a80aae94ef86a15faf9b | |
| parent | a3161dce432e315646ce81ac5b9630d4cb4c59b8 [diff] | |
| parent | 346a37f7d850eb02fd354493fb4216875cc850e5 [diff] |
Merge "Fix invalid shift of 32-bit value." into main am: 4fd5fe07ba am: 346a37f7d8 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3168962 Change-Id: Ie94a216ef9cc321174ffb09e585bf45df2b53c7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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,