Camera HALs: Promote device HAL v3.2
And deprecate older HALs.
Bug: 17445920
Change-Id: I37a5e53fda3c93080e37ec848f84c702a2c9120b
diff --git a/include/hardware/camera.h b/include/hardware/camera.h
index b7182f8..b1f18ff 100644
--- a/include/hardware/camera.h
+++ b/include/hardware/camera.h
@@ -22,7 +22,10 @@
/**
* Camera device HAL, initial version [ CAMERA_DEVICE_API_VERSION_1_0 ]
*
- * Supports the android.hardware.Camera API.
+ * DEPRECATED. New devices should use Camera HAL v3.2 or newer.
+ *
+ * Supports the android.hardware.Camera API, and the android.hardware.camera2
+ * API in legacy mode only.
*
* Camera devices that support this version of the HAL must return a value in
* the range HARDWARE_DEVICE_API_VERSION(0,0)-(1,FF) in
diff --git a/include/hardware/camera2.h b/include/hardware/camera2.h
index 5b182a8..d920d4b 100644
--- a/include/hardware/camera2.h
+++ b/include/hardware/camera2.h
@@ -23,9 +23,10 @@
/**
* Camera device HAL 2.1 [ CAMERA_DEVICE_API_VERSION_2_0, CAMERA_DEVICE_API_VERSION_2_1 ]
*
- * EXPERIMENTAL.
+ * DEPRECATED. New devices should use Camera HAL v3.2 or newer.
*
- * Supports the android.hardware.Camera APIs.
+ * Supports the android.hardware.Camera API, and the android.hardware.camera2
+ * API in legacy mode only.
*
* Camera devices that support this version of the HAL must return
* CAMERA_DEVICE_API_VERSION_2_1 in camera_device_t.common.version and in
diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h
index b024090..b705103 100644
--- a/include/hardware/camera3.h
+++ b/include/hardware/camera3.h
@@ -23,9 +23,10 @@
/**
* Camera device HAL 3.2 [ CAMERA_DEVICE_API_VERSION_3_2 ]
*
- * EXPERIMENTAL.
+ * This is the current recommended version of the camera device HAL.
*
- * Supports the android.hardware.Camera API.
+ * Supports the android.hardware.Camera API, and as of v3.2, the
+ * android.hardware.camera2 API in LIMITED or FULL modes.
*
* Camera devices that support this version of the HAL must return
* CAMERA_DEVICE_API_VERSION_3_2 in camera_device_t.common.version and in
diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h
index 322ed93..dadbc8f 100644
--- a/include/hardware/camera_common.h
+++ b/include/hardware/camera_common.h
@@ -114,8 +114,9 @@
#define CAMERA_DEVICE_API_VERSION_3_1 HARDWARE_DEVICE_API_VERSION(3, 1)
#define CAMERA_DEVICE_API_VERSION_3_2 HARDWARE_DEVICE_API_VERSION(3, 2)
-// Device version 2.x is outdated; device version 3.x is experimental
-#define CAMERA_DEVICE_API_VERSION_CURRENT CAMERA_DEVICE_API_VERSION_1_0
+// Device version 3.2 is current, older HAL camera device versions are not
+// recommended for new devices.
+#define CAMERA_DEVICE_API_VERSION_CURRENT CAMERA_DEVICE_API_VERSION_3_2
/**
* Defined in /system/media/camera/include/system/camera_metadata.h