commit 18782aa54e21ccd23dc53572bc60c53f9d120412
author Eino-Ville Talvala <etalvala@google.com> Mon Dec 19 16:35:29 2016 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Thu Jan 05 15:23:54 2017 -0800
tree 67353f8b7e33acc13876c6c9765d4ff04769d097
parent 3462b081483e76a4c76208bd078b86f4c35d621c

Camera: Update for service changes, part 2

- Indicate that HALv3.0 and v3.1 are no longer supported
- Update tests that reuse camera service plumbing to match
  service code changes

Test: Builds
Bug: 32991422
Change-Id: I13b800aea6f65270a2a621bd8a61705160fb2dc8

include/hardware/camera_common.h

diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h
index c74d7bb..7bafa88 100644
--- a/include/hardware/camera_common.h
+++ b/include/hardware/camera_common.h
@@ -143,8 +143,8 @@
 #define CAMERA_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION(1, 0) // DEPRECATED
 #define CAMERA_DEVICE_API_VERSION_2_0 HARDWARE_DEVICE_API_VERSION(2, 0) // NO LONGER SUPPORTED
 #define CAMERA_DEVICE_API_VERSION_2_1 HARDWARE_DEVICE_API_VERSION(2, 1) // NO LONGER SUPPORTED
-#define CAMERA_DEVICE_API_VERSION_3_0 HARDWARE_DEVICE_API_VERSION(3, 0)
-#define CAMERA_DEVICE_API_VERSION_3_1 HARDWARE_DEVICE_API_VERSION(3, 1)
+#define CAMERA_DEVICE_API_VERSION_3_0 HARDWARE_DEVICE_API_VERSION(3, 0) // NO LONGER SUPPORTED
+#define CAMERA_DEVICE_API_VERSION_3_1 HARDWARE_DEVICE_API_VERSION(3, 1) // NO LONGER SUPPORTED
 #define CAMERA_DEVICE_API_VERSION_3_2 HARDWARE_DEVICE_API_VERSION(3, 2)
 #define CAMERA_DEVICE_API_VERSION_3_3 HARDWARE_DEVICE_API_VERSION(3, 3)
 #define CAMERA_DEVICE_API_VERSION_3_4 HARDWARE_DEVICE_API_VERSION(3, 4)