commit 9cd140240c84789d00349c33e9c0b7a74d1543ed
author Chien-Yu Chen <cychen@google.com> Wed Mar 09 12:21:01 2016 -0800
committer Chien-Yu Chen <cychen@google.com> Wed Mar 09 14:55:14 2016 -0800
tree 80baad1161cbdd72fd3d12c7730a45ae6a30524b
parent 9322ba85a06ae149575ab102dc9bcffb4388cc7e

Camera3Device: Validate template ID

Validate template ID before creating a default request.

Bug: 26866110
Change-Id: Ifda457024f1d5c2b1382f189c1a8d5fda852d30d

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index 0692e5a..316cfda 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -710,6 +710,11 @@
         request != NULL) {
 
         request->swap(metadata);
+    } else if (err == BAD_VALUE) {
+        res = STATUS_ERROR_FMT(CameraService::ERROR_ILLEGAL_ARGUMENT,
+                "Camera %d: Template ID %d is invalid or not supported: %s (%d)",
+                mCameraId, templateId, strerror(-err), err);
+
     } else {
         res = STATUS_ERROR_FMT(CameraService::ERROR_INVALID_OPERATION,
                 "Camera %d: Error creating default request for template %d: %s (%d)",