Merge "Camera2 tests: Update for framework changes" into mnc-dev
diff --git a/include/hardware/bluetooth.h b/include/hardware/bluetooth.h
index 6f95684..da7f4b8 100644
--- a/include/hardware/bluetooth.h
+++ b/include/hardware/bluetooth.h
@@ -318,7 +318,7 @@
/** Bluetooth Legacy PinKey Request callback */
typedef void (*pin_request_callback)(bt_bdaddr_t *remote_bd_addr,
- bt_bdname_t *bd_name, uint32_t cod);
+ bt_bdname_t *bd_name, uint32_t cod, bool min_16_digit);
/** Bluetooth SSP Request callback - Just Works & Numeric Comparison*/
/** pass_key - Shall be 0 for BT_SSP_PAIRING_VARIANT_CONSENT &
diff --git a/include/hardware/bt_sock.h b/include/hardware/bt_sock.h
index 69775e0..5d206d7 100644
--- a/include/hardware/bt_sock.h
+++ b/include/hardware/bt_sock.h
@@ -22,6 +22,7 @@
#define BTSOCK_FLAG_AUTH (1 << 1)
#define BTSOCK_FLAG_NO_SDP (1 << 2)
#define BTSOCK_FLAG_AUTH_MITM (1 << 3)
+#define BTSOCK_FLAG_AUTH_16_DIGIT (1 << 4)
typedef enum {
BTSOCK_RFCOMM = 1,
diff --git a/include/hardware/fingerprint.h b/include/hardware/fingerprint.h
index 869502e..1fb803a 100644
--- a/include/hardware/fingerprint.h
+++ b/include/hardware/fingerprint.h
@@ -56,38 +56,12 @@
uint32_t fid;
} fingerprint_finger_id_t;
-/* The progress indication may be augmented by a bitmap encoded indication
-* of what finger area is considered as collected.
-* Bit numbers mapped to physical location:
-*
-* distal
-* +--+--+--+--+--+
-* | 4| 3| 2| 1| 0|
-* | 9| 8| 7| 6| 5|
-* medial |14|13|12|11|10| lateral
-* |19|18|17|16|15|
-* |24|23|22|21|20|
-* +--+--+--+--+--+
-* proximal
-*
-*/
-typedef uint32_t finger_map_bmp;
-
-typedef enum fingerprint_enroll_msg_type {
- FINGERPRINT_ENROLL_MSG_NONE = 0,
- FINGERPRINT_ENROLL_MSG_PREDEFINED = 1, /* TODO: define standard enroll cues */
- FINGERPRINT_ENROLL_MSG_BITMAP = 2, /* typeof(fingerprint_enroll.msg) == *finger_map_bmp */
- FINGERPRINT_ENROLL_MSG_VENDOR = 3
-} fingerprint_enroll_msg_type_t;
-
typedef struct fingerprint_enroll {
fingerprint_finger_id_t finger;
/* samples_remaining goes from N (no data collected, but N scans needed)
* to 0 (no more data is needed to build a template). */
uint32_t samples_remaining;
- fingerprint_enroll_msg_type_t msg_type;
- size_t msg_size;
- void *msg;
+ uint64_t msg; /* Vendor specific message. Used for user guidance */
} fingerprint_enroll_t;
typedef struct fingerprint_removed {
diff --git a/modules/fingerprint/fingerprint.c b/modules/fingerprint/fingerprint.c
index 33ede62..e81b182 100644
--- a/modules/fingerprint/fingerprint.c
+++ b/modules/fingerprint/fingerprint.c
@@ -58,7 +58,7 @@
}
static int fingerprint_set_active_group(struct fingerprint_device __unused *dev,
- uint32_t __unused gid) {
+ uint32_t __unused gid, const char __unused *store_path) {
return FINGERPRINT_ERROR;
}