Merge "add clarification on parameter passing in get call"
diff --git a/include/hardware/boot_control.h b/include/hardware/boot_control.h
index 62d6918..7a6a849 100644
--- a/include/hardware/boot_control.h
+++ b/include/hardware/boot_control.h
@@ -101,10 +101,11 @@
int (*setSlotAsUnbootable)(struct boot_control_module *module, unsigned slot);
/*
- * (*isSlotBootable)() returns if the slot passed in parameter has
- * booted successfully in the past.
- * Returns 1 if the slot has booted successfully, 0 if it has not,
- * and -errno on error.
+ * (*isSlotBootable)() returns if the slot passed in parameter is
+ * bootable. Note that slots can be made unbootable by both the
+ * bootloader and by the OS using setSlotAsUnbootable.
+ * Returns 1 if the slot is bootable, 0 if it's not, and -errno on
+ * error.
*/
int (*isSlotBootable)(struct boot_control_module *module, unsigned slot);
diff --git a/include/hardware/camera_common.h b/include/hardware/camera_common.h
index 42e4e20..c74d7bb 100644
--- a/include/hardware/camera_common.h
+++ b/include/hardware/camera_common.h
@@ -147,10 +147,11 @@
#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)
#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)
-// Device version 3.3 is current, older HAL camera device versions are not
+// Device version 3.4 is current, older HAL camera device versions are not
// recommended for new devices.
-#define CAMERA_DEVICE_API_VERSION_CURRENT CAMERA_DEVICE_API_VERSION_3_3
+#define CAMERA_DEVICE_API_VERSION_CURRENT CAMERA_DEVICE_API_VERSION_3_4
/**
* Defined in /system/media/camera/include/system/camera_metadata.h