commit cafa9ecee738e4e337ff950a0cbf517bbdad1fe7
author John Reck <jreck@google.com> Mon Jan 09 18:38:26 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 09 18:38:26 2023 +0000
tree 1973a1e596d853fb1a39a0a1c8f0dc47f96e4f79
parent 1a62da1e40973327f15a5ced46a9a225bbcdd0bc
parent 3bd679422bb9560dc340820e3235abc469412e66

Merge "Add standardized VERSION symbol"

cros_gralloc/aidl/Allocator.cpp

diff --git a/cros_gralloc/aidl/Allocator.cpp b/cros_gralloc/aidl/Allocator.cpp
index 48025b7..2ea5a0d 100644
--- a/cros_gralloc/aidl/Allocator.cpp
+++ b/cros_gralloc/aidl/Allocator.cpp
@@ -173,6 +173,10 @@
         return ToBinderStatus(AllocationError::NO_RESOURCES);
     }
 
+    if (!descriptor.additionalOptions.empty()) {
+        return ToBinderStatus(AllocationError::UNSUPPORTED);
+    }
+
     BufferDescriptorInfoV4 descriptionV4 = convertAidlToIMapperV4Descriptor(descriptor);
 
     std::vector<native_handle_t*> handles;
@@ -205,6 +209,11 @@
         return ToBinderStatus(AllocationError::NO_RESOURCES);
     }
 
+    if (!descriptor.additionalOptions.empty()) {
+        *outResult = false;
+        return ndk::ScopedAStatus::ok();
+    }
+
     struct cros_gralloc_buffer_descriptor crosDescriptor;
     if (convertToCrosDescriptor(convertAidlToIMapperV4Descriptor(descriptor), &crosDescriptor)) {
         // Failing to convert the descriptor means the layer count, pixel format, or usage is

cros_gralloc/mapper_stablec/Mapper.cpp

diff --git a/cros_gralloc/mapper_stablec/Mapper.cpp b/cros_gralloc/mapper_stablec/Mapper.cpp
index 4014b37..6c4ac86 100644
--- a/cros_gralloc/mapper_stablec/Mapper.cpp
+++ b/cros_gralloc/mapper_stablec/Mapper.cpp
@@ -22,6 +22,7 @@
 
 using namespace ::aidl::android::hardware::graphics::common;
 using namespace ::android::hardware::graphics::mapper;
+using ::aidl::android::hardware::graphics::allocator::BufferDescriptorInfo;
 using ::android::base::unique_fd;
 
 #define REQUIRE_DRIVER()                                           \
@@ -40,10 +41,9 @@
     REQUIRE_DRIVER()                                    \
     VALIDATE_BUFFER_HANDLE(bufferHandle)
 
-static_assert(
-        CROS_GRALLOC4_METADATA_MAX_NAME_SIZE >=
-                ::aidl::android::hardware::graphics::allocator::BufferDescriptorInfo{}.name.size(),
-        "Metadata name storage too small to fit a BufferDescriptorInfo::name");
+static_assert(CROS_GRALLOC4_METADATA_MAX_NAME_SIZE >=
+                      decltype(std::declval<BufferDescriptorInfo>().name){}.size(),
+              "Metadata name storage too small to fit a BufferDescriptorInfo::name");
 
 constexpr const char* STANDARD_METADATA_NAME =
         "android.hardware.graphics.common.StandardMetadataType";
@@ -216,8 +216,8 @@
     } else {
         if (region.left < 0 || region.top < 0 || region.right <= region.left ||
             region.bottom <= region.top) {
-            ALOGE("Failed to lock. Invalid accessRegion: [%d, %d, %d, %d]", region.left,
-                  region.top, region.right, region.bottom);
+            ALOGE("Failed to lock. Invalid accessRegion: [%d, %d, %d, %d]", region.left, region.top,
+                  region.right, region.bottom);
             return AIMAPPER_ERROR_BAD_VALUE;
         }
 
@@ -235,8 +235,8 @@
         }
 
         rect = {static_cast<uint32_t>(region.left), static_cast<uint32_t>(region.top),
-                             static_cast<uint32_t>(region.right - region.left),
-                             static_cast<uint32_t>(region.bottom - region.top)};
+                static_cast<uint32_t>(region.right - region.left),
+                static_cast<uint32_t>(region.bottom - region.top)};
     }
 
     uint8_t* addr[DRV_MAX_PLANES];