commit 2be5b9f9663f1f0d6a3b99b679cbfa3b43732e55
author Craig Donner <cdonner@google.com> Tue Jan 24 18:14:44 2017 -0800
committer Craig Donner <cdonner@google.com> Tue Jan 24 18:43:30 2017 -0800
tree fcdb119b2a6568e2415cb7ba0e095a30f5eef9e2
parent 5559543e81e5bb82e84433f35453197ef991ce15

Add support for BLOB format to HardwareBuffer.

Test: updated CTS test to check for error conditions if the blob dimensions are
bad.
Bug: 34050596

Change-Id: I3ec6e7a43dae8d0ac2b2d04bc4b38cd3c12f8390

native/android/hardware_buffer.cpp

diff --git a/native/android/hardware_buffer.cpp b/native/android/hardware_buffer.cpp
index 6a10cb5..2f75c10 100644
--- a/native/android/hardware_buffer.cpp
+++ b/native/android/hardware_buffer.cpp
@@ -89,6 +89,12 @@
         return BAD_VALUE;
     }
 
+    if (desc->format == AHARDWAREBUFFER_FORMAT_BLOB && desc->height != 1) {
+        ALOGE("Height must be 1 when using the AHARDWAREBUFFER_FORMAT_BLOB "
+                "format");
+        return BAD_VALUE;
+    }
+
     status_t err;
     uint32_t usage = android_hardware_HardwareBuffer_convertToGrallocUsageBits(
             desc->usage0, desc->usage1);