commit ace805805313827c7edde3bc6eb6624ab9f62dcb
author Eino-Ville Talvala <etalvala@google.com> Fri Mar 18 13:27:35 2016 -0700
committer Eino-Ville Talvala <etalvala@google.com> Fri Mar 18 13:43:08 2016 -0700
tree edc7923eca4c01c71ffcb2029531e1f5b88028c7
parent 7f7052f5e45f8eb1df80a6978e0095d9e9c9eded

Camera2: Send ILLEGAL_ARGUMENT error for a bad stream configuration

Bug: 24168122
Change-Id: Icd9ce14fcdd2f88c5bde01a9652bb8cb66875560

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index 316cfda..51c8148 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -342,7 +342,11 @@
     }
 
     status_t err = mDevice->configureStreams(isConstrainedHighSpeed);
-    if (err != OK) {
+    if (err == BAD_VALUE) {
+        res = STATUS_ERROR_FMT(CameraService::ERROR_ILLEGAL_ARGUMENT,
+                "Camera %d: Unsupported set of inputs/outputs provided",
+                mCameraId);
+    } else if (err != OK) {
         res = STATUS_ERROR_FMT(CameraService::ERROR_INVALID_OPERATION,
                 "Camera %d: Error configuring streams: %s (%d)",
                 mCameraId, strerror(-err), err);