Validate STRIDE
Bug: 261856851
Test: build & boot cf
Change-Id: I8a43d4eb3cb9d9bd6899e104ab443418587e6b98
diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp
index 514b45f..2106839 100644
--- a/libs/ui/Gralloc5.cpp
+++ b/libs/ui/Gralloc5.cpp
@@ -352,14 +352,12 @@
}
}
{
- (void)stride;
- // TODO(b/261856851): Add StandardMetadataType::STRIDE && enable this
- // auto value = getStandardMetadata<StandardMetadataType::STRIDE>(mMapper,
- // bufferHandle); if (static_cast<BufferUsage>(usage) != value) {
- // ALOGW("Layer count didn't match, expected %" PRIu64 " got %" PRId64, usage,
- // static_cast<int64_t>(value.value_or(BufferUsage::CPU_READ_NEVER)));
- // return BAD_VALUE;
- // }
+ auto value = getStandardMetadata<StandardMetadataType::STRIDE>(mMapper, bufferHandle);
+ if (stride != value) {
+ ALOGW("Stride didn't match, expected %" PRIu32 " got %" PRId32, stride,
+ value.value_or(-1));
+ return BAD_VALUE;
+ }
}
return OK;
}