From 1d762b4e8661aae603077d17bdfa958c84c91e8c Mon Sep 17 00:00:00 2001 From: John Reck Date: Wed, 7 Feb 2024 14:43:22 -0500 Subject: [PATCH] Fix VENDOR_MASK constant It's not supposed to be sign-extended as that blocks off the entire 28-64 bit range instead of the 28-31 bit range as indicated in the comment As this value is correct in HIDL and in the docs, do a history re-write of the AIDL value to match the intended (and previous) values. Test: make Bug: 323484008 Change-Id: I0b373576a366c853c87109a9b24ec9f8d9cbdb4d --- .../aidl/aidl_api/android.hardware.graphics.common/1/.hash | 1 + .../1/android/hardware/graphics/common/BufferUsage.aidl | 2 +- .../aidl/aidl_api/android.hardware.graphics.common/2/.hash | 1 + .../2/android/hardware/graphics/common/BufferUsage.aidl | 2 +- .../aidl/aidl_api/android.hardware.graphics.common/3/.hash | 1 + .../3/android/hardware/graphics/common/BufferUsage.aidl | 2 +- .../aidl/aidl_api/android.hardware.graphics.common/4/.hash | 1 + .../4/android/hardware/graphics/common/BufferUsage.aidl | 2 +- .../current/android/hardware/graphics/common/BufferUsage.aidl | 2 +- .../aidl/android/hardware/graphics/common/BufferUsage.aidl | 2 +- 10 files changed, 10 insertions(+), 6 deletions(-) diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/.hash b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/.hash index 66b5d134c5..babbf247ec 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/.hash +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/.hash @@ -1 +1,2 @@ f5bdf5724a941dc7e5e7d0ebe9dfe028f7bcc25f +71da13748094aa53237dd6eeac04f0f9add80aa1 diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/android/hardware/graphics/common/BufferUsage.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/android/hardware/graphics/common/BufferUsage.aidl index 58eefc4e2c..cb5bc9effa 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/android/hardware/graphics/common/BufferUsage.aidl +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/1/android/hardware/graphics/common/BufferUsage.aidl @@ -42,6 +42,6 @@ enum BufferUsage { GPU_MIPMAP_COMPLETE = 67108864, HW_IMAGE_ENCODER = 134217728, GPU_DATA_BUFFER = 16777216, - VENDOR_MASK = -268435456, + VENDOR_MASK = 4026531840, VENDOR_MASK_HI = -281474976710656, } diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/.hash b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/.hash index 167ed0e300..54f8f32717 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/.hash +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/.hash @@ -1 +1,2 @@ bd2f5e2ab1d5112dfe982f64012e425f544c9d60 +4279f88ef38c8fdeea6797410b464ae29df34e72 diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/android/hardware/graphics/common/BufferUsage.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/android/hardware/graphics/common/BufferUsage.aidl index b4ef4515c7..5e23bcc905 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/android/hardware/graphics/common/BufferUsage.aidl +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/2/android/hardware/graphics/common/BufferUsage.aidl @@ -58,6 +58,6 @@ enum BufferUsage { GPU_MIPMAP_COMPLETE = 67108864, HW_IMAGE_ENCODER = 134217728, GPU_DATA_BUFFER = 16777216, - VENDOR_MASK = -268435456, + VENDOR_MASK = 4026531840, VENDOR_MASK_HI = -281474976710656, } diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/.hash b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/.hash index dfda68f42d..53eb6bd996 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/.hash +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/.hash @@ -1 +1,2 @@ e7e8b0bd7cd27ab4f1998700ef19ebc82e022d87 +37aa15ac89ae27f3f89099d79609f5aaa1717de5 diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/android/hardware/graphics/common/BufferUsage.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/android/hardware/graphics/common/BufferUsage.aidl index d3ab44f2ce..f91625f07d 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/android/hardware/graphics/common/BufferUsage.aidl +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/3/android/hardware/graphics/common/BufferUsage.aidl @@ -60,6 +60,6 @@ enum BufferUsage { GPU_MIPMAP_COMPLETE = 67108864, HW_IMAGE_ENCODER = 134217728, FRONT_BUFFER = 4294967296, - VENDOR_MASK = -268435456, + VENDOR_MASK = 4026531840, VENDOR_MASK_HI = -281474976710656, } diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/.hash b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/.hash index ef17b34926..fe20ff9d70 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/.hash +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/.hash @@ -1 +1,2 @@ 9bcf4b83485ce912dc39108201504f77b8c96cef +adb71c34ba271f87c6431845b310777c1e611ebf diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/android/hardware/graphics/common/BufferUsage.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/android/hardware/graphics/common/BufferUsage.aidl index d42a6d57b8..52b2a56cb7 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/android/hardware/graphics/common/BufferUsage.aidl +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/4/android/hardware/graphics/common/BufferUsage.aidl @@ -60,6 +60,6 @@ enum BufferUsage { GPU_MIPMAP_COMPLETE = (1 << 26) /* 67108864 */, HW_IMAGE_ENCODER = (1 << 27) /* 134217728 */, FRONT_BUFFER = (1L << 32) /* 4294967296 */, - VENDOR_MASK = (0xf << 28) /* -268435456 */, + VENDOR_MASK = (0xfL << 28) /* 4026531840 */, VENDOR_MASK_HI = ((1L * 0xffff) << 48) /* -281474976710656 */, } diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/BufferUsage.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/BufferUsage.aidl index d42a6d57b8..52b2a56cb7 100644 --- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/BufferUsage.aidl +++ b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/BufferUsage.aidl @@ -60,6 +60,6 @@ enum BufferUsage { GPU_MIPMAP_COMPLETE = (1 << 26) /* 67108864 */, HW_IMAGE_ENCODER = (1 << 27) /* 134217728 */, FRONT_BUFFER = (1L << 32) /* 4294967296 */, - VENDOR_MASK = (0xf << 28) /* -268435456 */, + VENDOR_MASK = (0xfL << 28) /* 4026531840 */, VENDOR_MASK_HI = ((1L * 0xffff) << 48) /* -281474976710656 */, } diff --git a/graphics/common/aidl/android/hardware/graphics/common/BufferUsage.aidl b/graphics/common/aidl/android/hardware/graphics/common/BufferUsage.aidl index 0d1a094b36..7d39d95753 100644 --- a/graphics/common/aidl/android/hardware/graphics/common/BufferUsage.aidl +++ b/graphics/common/aidl/android/hardware/graphics/common/BufferUsage.aidl @@ -150,7 +150,7 @@ enum BufferUsage { FRONT_BUFFER = 1L << 32, /** bits 28-31 are reserved for vendor extensions */ - VENDOR_MASK = 0xf << 28, + VENDOR_MASK = 0xfL << 28, /** bits 33-47 must be zero and are reserved for future versions */ /** bits 48-63 are reserved for vendor extensions */