drm_hwcomposer: check ConvertBoInfo errors before importing
Signed-off-by: Jason Macnak <natsu@google.com>
diff --git a/utils/hwcutils.cpp b/utils/hwcutils.cpp
index 8cd5c65..322efce 100644
--- a/utils/hwcutils.cpp
+++ b/utils/hwcutils.cpp
@@ -48,11 +48,17 @@
int DrmHwcBuffer::ImportBuffer(buffer_handle_t handle, Importer *importer) {
hwc_drm_bo tmp_bo{};
- BufferInfoGetter::GetInstance()->ConvertBoInfo(handle, &tmp_bo);
-
- int ret = importer->ImportBuffer(&tmp_bo);
- if (ret)
+ int ret = BufferInfoGetter::GetInstance()->ConvertBoInfo(handle, &tmp_bo);
+ if (ret) {
+ ALOGE("Failed to convert buffer info %d", ret);
return ret;
+ }
+
+ ret = importer->ImportBuffer(&tmp_bo);
+ if (ret) {
+ ALOGE("Failed to import buffer %d", ret);
+ return ret;
+ }
if (importer_ != NULL) {
importer_->ReleaseBuffer(&bo_);